Fix: "make uninstall" must remove po-mode.el even when $(DESTDIR) is nonempty.

diff --git a/ChangeLog b/ChangeLog
index a54892be84c25ac34b06a896b06ab1f7b33d364f..5f0b02d59a7a97c347e8feb36d88e124fd70bef1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-28  Bruno Haible  <haible@clisp.cons.org>
+
+       * configure.in: Postprocess misc/Makefile to workaround an automake
+       bug.
+
 2000-06-16  Bruno Haible  <haible@clisp.cons.org>
 
        * Makefile.am: Put back the ACLOCAL_AMFLAGS definition, but define

diff --git a/configure b/configure
index 81c6727bdb50f17bc348e4ad7a0961a6dddc93b8..3911db24ea3d310d7729edcc98430e2fef3cf077 100755 (executable)
--- a/configure
+++ b/configure
@@ -4798,6 +4798,10 @@ case "$CONFIG_FILES" in *po/Makefile.in*)
         sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
       esac
 
+      sed -e 's/rm -f \$(lispdir)/rm -f \$(DESTDIR)\$(lispdir)/' < misc/Makefile \
+      > misc/Makefile.tmp
+  mv misc/Makefile.tmp misc/Makefile
+
 exit 0
 EOF
 chmod +x $CONFIG_STATUS

diff --git a/configure.in b/configure.in
index 0684fda22223ab6dadb68cab10feb470a43125c6..ebe52aa1ceaa905512502486f700ea5bc320c63d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.12)
-AC_REVISION($Revision: 1.1 $)
+AC_REVISION($Revision: 1.2 $)
 AC_INIT(src/msgfmt.c)
 AM_INIT_AUTOMAKE(gettext, 0.10.36)
 AM_CONFIG_HEADER(config.h)
@@ -76,8 +76,10 @@ echo "GNU gettext library from $PACKAGE-$VERSION" > intl/VERSION
 
 AC_OUTPUT([Makefile lib/Makefile intl/Makefile src/Makefile \
            po/Makefile.in doc/Makefile tests/Makefile m4/Makefile \
-          misc/Makefile misc/gettextize intl/intlh.inst])
-dnl       misc/Makefile misc/gettextize intl/intlh.inst],
-dnl      [case "$CONFIG_FILES" in *po/Makefile.in*)
-dnl       sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
-dnl       esac])
+          misc/Makefile misc/gettextize intl/intlh.inst], [
+  dnl Workaround an automake-1.4 bug which generates an incorrect uninstall
+  dnl target in misc/Makefile.in.
+  sed -e 's/rm -f \$(lispdir)/rm -f \$(DESTDIR)\$(lispdir)/' < misc/Makefile \
+      > misc/Makefile.tmp
+  mv misc/Makefile.tmp misc/Makefile
+])