From: Bruno Haible <bruno@clisp.org>
Date: Fri, 28 Jul 2000 17:41:22 +0000 (+0000)
Subject: Fix: "make uninstall" must remove po-mode.el even when $(DESTDIR) is nonempty.
X-Git-Tag: v0.10.36~251
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35d46a4f7e9b7c48776540e5d7b733a7ec3c1622;p=thirdparty%2Fgettext.git

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

diff --git a/ChangeLog b/ChangeLog
index a54892be8..5f0b02d59 100644
--- 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 81c6727bd..3911db24e 100755
--- 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 0684fda22..ebe52aa1c 100644
--- 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
+])