lib/Makefile.am: Use $(DESTDIR) before local installation paths. - enscript - GNU Enscript
(HTM) git clone git://thinkerwim.org/enscript.git
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit 2b06816cd764dc38454271be99d653c403135c47
(DIR) parent ea8d72b2c6e2ff066d5d7efb81297d66d32d2f83
(HTM) Author: Tim Retout <diocles@gnu.org>
Date: Tue, 29 Jan 2008 21:10:40 +0000
lib/Makefile.am: Use $(DESTDIR) before local installation paths.
Diffstat:
M lib/ChangeLog | 6 ++++++
M lib/Makefile.am | 11 ++++++-----
2 files changed, 12 insertions(+), 5 deletions(-)
---
(DIR) diff --git a/lib/ChangeLog b/lib/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-29 Tim Retout <diocles@gnu.org>
+
+ * Makefile.am (install-data-local): Prefix installation paths with
+ $(DESTDIR), to avoid breaking `make distcheck'.
+ (uninstall-local): Likewise.
+
2008-01-01 Tim Retout <diocles@gnu.org>
* ChangeLog: Run M-x change-log-redate. Add copyright notice at end.
(DIR) diff --git a/lib/Makefile.am b/lib/Makefile.am
@@ -38,15 +38,16 @@ CLEANFILES = enscript.cfg
all-local: enscript.cfg
install-data-local: enscript.cfg
- $(top_srcdir)/mkinstalldirs $(sysconfdir)
- if test -r $(sysconfdir)/enscript.cfg; then \
- cp $(sysconfdir)/enscript.cfg $(sysconfdir)/enscript.cfg.old; \
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
+ if test -r $(DESTDIR)$(sysconfdir)/enscript.cfg; then \
+ cp $(DESTDIR)$(sysconfdir)/enscript.cfg \
+ $(DESTDIR)$(sysconfdir)/enscript.cfg.old; \
else :; \
fi
- $(INSTALL_DATA) enscript.cfg $(sysconfdir)/enscript.cfg
+ $(INSTALL_DATA) enscript.cfg $(DESTDIR)$(sysconfdir)/enscript.cfg
uninstall-local:
- rm -f $(sysconfdir)/enscript.cfg
+ rm -f $(DESTDIR)$(sysconfdir)/enscript.cfg
enscript.cfg: $(srcdir)/enscript.cfg.in Makefile
sed 's%@DATADIR@%$(datadir)%g; s%@media@%@MEDIA@%g; s%@BINDIR@%$(bindir)%g; s%@spooler@%@SPOOLER@%g; s%@pslevel@%@PSLEVEL@%g' \