From: Bruno Haible <bruno@clisp.org>
Date: Wed, 26 Jul 2000 18:19:37 +0000 (+0000)
Subject: Add support for DESTDIR, as recommended by GNU standards.
X-Git-Tag: v0.10.36~259
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d95d8e218b42dd02880595503d3bfbb0a4f7a395;p=thirdparty%2Fgettext.git

Add support for DESTDIR, as recommended by GNU standards.
---

diff --git a/intl/ChangeLog b/intl/ChangeLog
index 0ca13ddeb..e692037e2 100644
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,9 @@
+2000-07-26  Bruno Haible  <haible@clisp.cons.org>
+
+	* Makefile.in (install-exec, install-data, uninstall): Provide DESTDIR
+	support, as recommended by GNU standards. Fix misapplied 2000-06-16
+	patch.
+
 2000-06-16  Bruno Haible  <haible@clisp.cons.org>
 
 	* Makefile.in (COMSRCS): Add localcharset.c.
diff --git a/intl/Makefile.in b/intl/Makefile.in
index 0bd174a79..f092a7fee 100644
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -129,55 +129,49 @@ install-exec: all
 	if test "$(PACKAGE)" = "gettext" \
 	   && test '@INTLOBJS@' = '$(GETTOBJS)'; then \
 	  if test -r $(MKINSTALLDIRS); then \
-	    $(MKINSTALLDIRS) $(libdir) $(includedir); \
+	    $(MKINSTALLDIRS) $(DESTDIR)$(libdir); \
+	    $(MKINSTALLDIRS) $(DESTDIR)$(includedir); \
 	  else \
-	    $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \
+	    $(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir); \
+	    $(top_srcdir)/mkinstalldirs $(DESTDIR)$(includedir); \
 	  fi; \
-	  $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \
-	  $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \
+	  $(INSTALL_DATA) intlh.inst $(DESTDIR)$(includedir)/libintl.h; \
+	  $(INSTALL_DATA) libintl.a $(DESTDIR)$(libdir)/libintl.a; \
 	else \
 	  : ; \
 	fi; \
 	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
 	  if test -r $(MKINSTALLDIRS); then \
-	    $(MKINSTALLDIRS) $(libdir); \
+	    $(MKINSTALLDIRS) $(DESTDIR)$(libdir); \
 	  else \
-	    $(top_srcdir)/mkinstalldirs $(libdir); \
+	    $(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir); \
 	  fi; \
-	  test -f $(libdir)/charset.alias && orig=$(libdir)/charset.alias \
-					  || orig=charset.alias; \
-	  sed -f ref-add.sed $$orig > $(libdir)/t-charset.alias; \
-	  $(INSTALL_DATA) $(libdir)/t-charset.alias $(libdir)/charset.alias; \
-	  rm -f $(libdir)/t-charset.alias; \
+	  test -f $(DESTDIR)$(libdir)/charset.alias \
+	    && orig=$(DESTDIR)$(libdir)/charset.alias \
+	    || orig=charset.alias; \
+	  temp=$(DESTDIR)$(libdir)/t-charset.alias; \
+	  dest=$(DESTDIR)$(libdir)/charset.alias; \
+	  sed -f ref-add.sed $$orig > $$temp; \
+	  $(INSTALL_DATA) $$temp $$dest; \
+	  rm -f $$temp; \
 	else \
 	  : ; \
 	fi
 install-data: all
 	if test "$(PACKAGE)" = "gettext"; then \
 	  if test -r $(MKINSTALLDIRS); then \
-	    $(MKINSTALLDIRS) $(gettextsrcdir); \
+	    $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
 	  else \
-	    $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
+	    $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
 	  fi; \
-	  $(INSTALL_DATA) VERSION $(gettextsrcdir)/VERSION; \
+	  $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
 	  dists="$(DISTFILES.common)"; \
 	  for file in $$dists; do \
-	    $(INSTALL_DATA) $(srcdir)/$$file $(gettextsrcdir)/$$file; \
+	    $(INSTALL_DATA) $(srcdir)/$$file \
+			    $(DESTDIR)$(gettextsrcdir)/$$file; \
 	  done; \
 	else \
 	  : ; \
-	fi; \
-	if test '@USE_INCLUDED_LIBINTL@' = yes \
-	  && test -f $(libdir)/charset.alias; then \
-	  sed -f ref-del.sed $(libdir)/charset.alias > $(libdir)/t-charset.alias; \
-	  if grep '^# Packages using this file: $$' $(libdir)/t-charset.alias > /dev/null; then \
-	    rm -f $(libdir)/t-charset.alias; \
-	  else \
-	    $(INSTALL_DATA) $(libdir)/t-charset.alias $(libdir)/charset.alias; \
-	  fi; \
-	  rm -f $(libdir)/t-charset.alias; \
-	else \
-	  : ; \
 	fi
 
 # Define this as empty until I found a useful application.
@@ -186,8 +180,22 @@ installcheck:
 uninstall:
 	dists="$(DISTFILES.common)"; \
 	for file in $$dists; do \
-	  rm -f $(gettextsrcdir)/$$file; \
-	done
+	  rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+	done; \
+	if test '@USE_INCLUDED_LIBINTL@' = yes \
+	  && test -f $(DESTDIR)$(libdir)/charset.alias; then \
+	  temp=$(DESTDIR)$(libdir)/t-charset.alias; \
+	  dest=$(DESTDIR)$(libdir)/charset.alias; \
+	  sed -f ref-del.sed $$dest > $$temp; \
+	  if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
+	    rm -f $$temp; \
+	  else \
+	    $(INSTALL_DATA) $$temp $$dest; \
+	  fi; \
+	  rm -f $$temp; \
+	else \
+	  : ; \
+	fi
 
 info dvi: