Fix the uninstall targets.

diff --git a/intl/ChangeLog b/intl/ChangeLog
index 149039b154ff5837f8dcc70e024a125d245451dc..15be3d6b20180578daedf6e1a5644cc210b49e70 100644 (file)
--- 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 5550b7d12fc1d8add58d94c730bd82cfcea2b181..b76a8808f53f3f14d28a9505632f30c7eb2745bb 100644 (file)
--- 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 c2e69bbe139274c77b439fa3986ffe349020410b..bbc265599a1d19d96d62ff1465a6009abbcd5478 100644 (file)
--- 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 2ba0f24d4b79d7fc6d580d1cc552a3f18fcd906e..2e176d86b63b58fad34fd9ecf67f66001d0915af 100644 (file)
--- 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