ilib/Makefile.am: Replace custom install rules with new sysconf_DATA variable. Factor out variable substitution rule from enscript.cfg generation. - enscript - GNU Enscript Err thinkerwim.openbsd.amsterdam 70 hgit clone git://thinkerwim.org/enscript.git URL:git://thinkerwim.org/enscript.git thinkerwim.org 70 1Log /git/enscript/log.gph thinkerwim.org 70 1Files /git/enscript/files.gph thinkerwim.org 70 1Refs /git/enscript/refs.gph thinkerwim.org 70 1README /git/enscript/file/README.gph thinkerwim.org 70 1LICENSE /git/enscript/file/COPYING.gph thinkerwim.org 70 i--- Err thinkerwim.openbsd.amsterdam 70 1commit 2ebf0fd4bd6ec1cb90408c070724a6d1f98facc9 /git/enscript/commit/2ebf0fd4bd6ec1cb90408c070724a6d1f98facc9.gph thinkerwim.org 70 1parent f45916a858830c812a6c29bd978fc65ec5c08555 /git/enscript/commit/f45916a858830c812a6c29bd978fc65ec5c08555.gph thinkerwim.org 70 hAuthor: Tim Retout URL:mailto:diocles@gnu.org thinkerwim.org 70 iDate: Sun, 3 Feb 2008 15:49:11 +0000 Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 ilib/Makefile.am: Replace custom install rules with new sysconf_DATA variable. Err thinkerwim.openbsd.amsterdam 70 iFactor out variable substitution rule from enscript.cfg generation. Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 iDiffstat: Err thinkerwim.openbsd.amsterdam 70 i M lib/ChangeLog | 12 ++++++++++++ Err thinkerwim.openbsd.amsterdam 70 i M lib/Makefile.am | 27 ++++++++++----------------- Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i2 files changed, 22 insertions(+), 17 deletions(-) Err thinkerwim.openbsd.amsterdam 70 i--- Err thinkerwim.openbsd.amsterdam 70 1diff --git a/lib/ChangeLog b/lib/ChangeLog /git/enscript/file/lib/ChangeLog.gph thinkerwim.org 70 i@@ -1,3 +1,15 @@ Err thinkerwim.openbsd.amsterdam 70 i+2008-02-03 Tim Retout Err thinkerwim.openbsd.amsterdam 70 i+ Err thinkerwim.openbsd.amsterdam 70 i+ * Makefile.am (install-data-local): Remove. (Note that a backup of the Err thinkerwim.openbsd.amsterdam 70 i+ config file will no longer be taken during installation.) Err thinkerwim.openbsd.amsterdam 70 i+ (uninstall-local): Likewise. Err thinkerwim.openbsd.amsterdam 70 i+ (all-local): Likewise. Err thinkerwim.openbsd.amsterdam 70 i+ (sysconf_DATA): New variable for location of config file. Err thinkerwim.openbsd.amsterdam 70 i+ (CLEANFILES): Reference $(sysconf_DATA) variable. Err thinkerwim.openbsd.amsterdam 70 i+ (do_subst): New variable to hold the variable substitution command. Err thinkerwim.openbsd.amsterdam 70 i+ (enscript.cfg): Use $(do_subst). Remove unnecessary $(srcdir) prefix Err thinkerwim.openbsd.amsterdam 70 i+ from enscript.cfg.in dependency. Err thinkerwim.openbsd.amsterdam 70 i+ Err thinkerwim.openbsd.amsterdam 70 i 2008-01-29 Tim Retout Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i * Makefile.am (install-data-local): Prefix installation paths with Err thinkerwim.openbsd.amsterdam 70 1diff --git a/lib/Makefile.am b/lib/Makefile.am /git/enscript/file/lib/Makefile.am.gph thinkerwim.org 70 i@@ -30,25 +30,18 @@ koi8.enc 88591.enc 88592.enc 88593.enc 88594.enc 88595.enc 88597.enc \ Err thinkerwim.openbsd.amsterdam 70 i edd.hdr emacs.hdr enscript.hdr enscript-color.hdr frame.hdr mp.hdr \ Err thinkerwim.openbsd.amsterdam 70 i simple.hdr squeeze.hdr enscript.pro Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i+sysconf_DATA = enscript.cfg Err thinkerwim.openbsd.amsterdam 70 i+CLEANFILES = $(sysconf_DATA) Err thinkerwim.openbsd.amsterdam 70 i+ Err thinkerwim.openbsd.amsterdam 70 i EXTRA_DIST = enscript.cfg.in $(pkgdata_DATA) Makefile-encodings \ Err thinkerwim.openbsd.amsterdam 70 i make-encoding.pl Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i-CLEANFILES = enscript.cfg Err thinkerwim.openbsd.amsterdam 70 i- Err thinkerwim.openbsd.amsterdam 70 i-all-local: enscript.cfg Err thinkerwim.openbsd.amsterdam 70 i- Err thinkerwim.openbsd.amsterdam 70 i-install-data-local: enscript.cfg Err thinkerwim.openbsd.amsterdam 70 i- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir) Err thinkerwim.openbsd.amsterdam 70 i- if test -r $(DESTDIR)$(sysconfdir)/enscript.cfg; then \ Err thinkerwim.openbsd.amsterdam 70 i- cp $(DESTDIR)$(sysconfdir)/enscript.cfg \ Err thinkerwim.openbsd.amsterdam 70 i- $(DESTDIR)$(sysconfdir)/enscript.cfg.old; \ Err thinkerwim.openbsd.amsterdam 70 i- else :; \ Err thinkerwim.openbsd.amsterdam 70 i- fi Err thinkerwim.openbsd.amsterdam 70 i- $(INSTALL_DATA) enscript.cfg $(DESTDIR)$(sysconfdir)/enscript.cfg Err thinkerwim.openbsd.amsterdam 70 i+do_subst = sed -e 's%@DATADIR@%$(datadir)%g' \ Err thinkerwim.openbsd.amsterdam 70 i+ -e 's%@media@%@MEDIA@%g' \ Err thinkerwim.openbsd.amsterdam 70 i+ -e 's%@BINDIR@%$(bindir)%g' \ Err thinkerwim.openbsd.amsterdam 70 i+ -e 's%@spooler@%@SPOOLER@%g' \ Err thinkerwim.openbsd.amsterdam 70 i+ -e 's%@pslevel@%@PSLEVEL@%g' Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i-uninstall-local: Err thinkerwim.openbsd.amsterdam 70 i- rm -f $(DESTDIR)$(sysconfdir)/enscript.cfg Err thinkerwim.openbsd.amsterdam 70 i+enscript.cfg: enscript.cfg.in Makefile Err thinkerwim.openbsd.amsterdam 70 i+ $(do_subst) < $(srcdir)/enscript.cfg.in > enscript.cfg Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i-enscript.cfg: $(srcdir)/enscript.cfg.in Makefile Err thinkerwim.openbsd.amsterdam 70 i- sed 's%@DATADIR@%$(datadir)%g; s%@media@%@MEDIA@%g; s%@BINDIR@%$(bindir)%g; s%@spooler@%@SPOOLER@%g; s%@pslevel@%@PSLEVEL@%g' \ Err thinkerwim.openbsd.amsterdam 70 i- $(srcdir)/enscript.cfg.in >enscript.cfg Err thinkerwim.openbsd.amsterdam 70 .