From: Bruno Haible <bruno@clisp.org>
Date: Fri, 28 Jul 2000 17:07:50 +0000 (+0000)
Subject: Fix the uninstall targets.
X-Git-Tag: v0.10.36~253
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4634294a051ce54be7ac1c020eba4efc196f6d8e;p=thirdparty%2Fgettext.git

Fix the uninstall targets.
---

diff --git a/intl/ChangeLog b/intl/ChangeLog
index 149039b15..15be3d6b2 100644
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-28  Bruno Haible  <haible@clisp.cons.org>
+
+	* Makefile.in (uninstall): Synchronize with the install target.
+
 2000-07-28  Bruno Haible  <haible@clisp.cons.org>
 
 	* Makefile.in (mkinstalldirs): New macro. Needed when configured with
diff --git a/intl/Makefile.in b/intl/Makefile.in
index 5550b7d12..b76a8808f 100644
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -140,7 +140,7 @@ install-exec: all
 	  $(INSTALL_DATA) libintl.a $(DESTDIR)$(libdir)/libintl.a; \
 	else \
 	  : ; \
-	fi; \
+	fi
 	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
 	  $(mkinstalldirs) $(DESTDIR)$(libdir); \
 	  test -f $(DESTDIR)$(libdir)/charset.alias \
@@ -171,10 +171,13 @@ install-data: all
 installcheck:
 
 uninstall:
-	dists="$(DISTFILES.common)"; \
-	for file in $$dists; do \
-	  rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
-	done; \
+	if test "$(PACKAGE)" = "gettext" \
+	   && test '@INTLOBJS@' = '$(GETTOBJS)'; then \
+	  rm -f $(DESTDIR)$(includedir)/libintl.h; \
+	  rm -f $(DESTDIR)$(libdir)/libintl.a; \
+	else \
+	  : ; \
+	fi
 	if test '@USE_INCLUDED_LIBINTL@' = yes \
 	  && test -f $(DESTDIR)$(libdir)/charset.alias; then \
 	  temp=$(DESTDIR)$(libdir)/t-charset.alias; \
@@ -189,6 +192,14 @@ uninstall:
 	else \
 	  : ; \
 	fi
+	if test "$(PACKAGE)" = "gettext"; then \
+	  dists="$(DISTFILES.common)"; \
+	  for file in VERSION $$dists; do \
+	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+	  done; \
+	else \
+	  : ; \
+	fi
 
 info dvi:
 
diff --git a/po/ChangeLog b/po/ChangeLog
index c2e69bbe1..bbc265599 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-28  Bruno Haible  <haible@clisp.cons.org>
+
+	* Makefile.in.in (uninstall): Synchronize with the install target.
+
 2000-07-28  Bruno Haible  <haible@clisp.cons.org>
 
 	* Makefile.in.in (top_builddir, mkinstalldirs): New macros. Needed
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 2ba0f24d4..2e176d86b 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -162,12 +162,19 @@ uninstall:
 	catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
+	  case "$$cat" in \
+	    *.gmo) destdir=$(gnulocaledir);; \
+	    *)     destdir=$(localedir);; \
+	  esac; \
 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
-	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
-	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
-	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+	  rm -f $(DESTDIR)$$destdir/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+	  rm -f $(DESTDIR)$$destdir/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
 	done
+	if test "$(PACKAGE)" = "gettext"; then \
+	  rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
+	else \
+	  : ; \
+	fi
 
 check: all