summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwl <wl>2006-02-26 14:02:44 +0000
committerwl <wl>2006-02-26 14:02:44 +0000
commitc0bef9e6a3c29f5ce6984e042deabbd0c265c50d (patch)
tree1b8362f920ecf7e3d5abff30cc64c25b7f338fd4
parent0a7f0d90edbc68a5910f8e8b3defbf38e84eeed4 (diff)
downloadgroff-c0bef9e6a3c29f5ce6984e042deabbd0c265c50d.tar.gz
o Makefile.sub: Add DESTDIR to install and uninstall targets to support
staged installations.
-rw-r--r--contrib/mom/ChangeLog5
-rw-r--r--contrib/mom/Makefile.sub38
2 files changed, 26 insertions, 17 deletions
diff --git a/contrib/mom/ChangeLog b/contrib/mom/ChangeLog
index b7c79ea0..32c927cd 100644
--- a/contrib/mom/ChangeLog
+++ b/contrib/mom/ChangeLog
@@ -1,3 +1,8 @@
+*Sun Feb 26 2006
+
+o Makefile.sub: Add DESTDIR to install and uninstall targets to support
+ staged installations.
+
*Fri Feb 24 2006
o Removed superfluous "if" from FONT, line 492
diff --git a/contrib/mom/Makefile.sub b/contrib/mom/Makefile.sub
index b71ccda3..219a1c08 100644
--- a/contrib/mom/Makefile.sub
+++ b/contrib/mom/Makefile.sub
@@ -1,4 +1,4 @@
-# Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# Written by Werner Lemberg (wl@gnu.org)
#
# This file is part of groff.
@@ -104,35 +104,39 @@ examples/stamp:
install_data: $(NORMALFILES) $(HTMLDOCFILES) \
$(EXAMPLEFILES) $(PROCESSEDEXAMPLEFILES)
- -test -d $(tmacdir) || $(mkinstalldirs) $(tmacdir)
+ -test -d $(DESTDIR)$(tmacdir) || $(mkinstalldirs) $(DESTDIR)$(tmacdir)
for f in $(NORMALFILES); do \
- rm -f $(tmacdir)/$$f; \
- $(INSTALL_DATA) $(srcdir)/$$f $(tmacdir)/$$f; \
+ rm -f $(DESTDIR)$(tmacdir)/$$f; \
+ $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(tmacdir)/$$f; \
done
- -test -d $(htmldocdir)/mom || $(mkinstalldirs) $(htmldocdir)/mom
+ -test -d $(DESTDIR)$(htmldocdir)/mom \
+ || $(mkinstalldirs) $(DESTDIR)$(htmldocdir)/mom
for f in $(HTMLDOCFILES_); do \
- rm -f $(htmldocdir)/mom/$$f; \
- $(INSTALL_DATA) $(srcdir)/momdoc/$$f $(htmldocdir)/mom/$$f; \
+ rm -f $(DESTDIR)$(htmldocdir)/mom/$$f; \
+ $(INSTALL_DATA) $(srcdir)/momdoc/$$f \
+ $(DESTDIR)$(htmldocdir)/mom/$$f; \
done
- -test -d $(exampledir)/mom || $(mkinstalldirs) $(exampledir)/mom
+ -test -d $(DESTDIR)$(exampledir)/mom \
+ || $(mkinstalldirs) $(DESTDIR)$(exampledir)/mom
for f in $(EXAMPLEFILES_); do \
- rm -f $(exampledir)/mom/$$f; \
- $(INSTALL_DATA) $(srcdir)/examples/$$f $(exampledir)/mom/$$f; \
+ rm -f $(DESTDIR)$(exampledir)/mom/$$f; \
+ $(INSTALL_DATA) $(srcdir)/examples/$$f \
+ $(DESTDIR)$(exampledir)/mom/$$f; \
done
for f in $(PROCESSEDEXAMPLEFILES_); do \
- rm -f $(exampledir)/mom/$$f; \
- $(INSTALL_DATA) examples/$$f $(exampledir)/mom/$$f; \
+ rm -f $(DESTDIR)$(exampledir)/mom/$$f; \
+ $(INSTALL_DATA) examples/$$f $(DESTDIR)$(exampledir)/mom/$$f; \
done
uninstall_sub:
-for f in $(NORMALFILES); do \
- rm -f $(tmacdir)/$$f; \
+ rm -f $(DESTDIR)$(tmacdir)/$$f; \
done
-for f in $(HTMLDOCFILES_); do \
- rm -f $(htmldocdir)/mom/$$f; \
+ rm -f $(DESTDIR)$(htmldocdir)/mom/$$f; \
done
- -rmdir $(htmldocdir)/mom
+ -rmdir $(DESTDIR)$(htmldocdir)/mom
-for f in $(EXAMPLEFILES_) $(PROCESSEDEXAMPLEFILES_); do \
- rm -f $(exampledir)/mom/$$f; \
+ rm -f $(DESTDIR)$(exampledir)/mom/$$f; \
done
- -rmdir $(exampledir)/mom
+ -rmdir $(DESTDIR)$(exampledir)/mom