From: Bruno Haible <bruno@clisp.org>
Date: Sun, 11 Mar 2001 15:54:09 +0000 (+0000)
Subject: Portability to FreeBSD and to systems without Emacs.
X-Git-Tag: v0.10.36~89
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df7be532ac529fb1f5474601660b3723e8640e7d;p=thirdparty%2Fgettext.git

Portability to FreeBSD and to systems without Emacs.
---

diff --git a/ChangeLog b/ChangeLog
index 0297a9cc7..48a726fe8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2001-03-10  Bruno Haible  <haible@clisp.cons.org>
+
+	* INSTALL: New section "Particular Systems".
+
+	* configure.in: Postprocess Makefile to work around another
+	automake-1.4 bug: on FreeBSD, shell commands are run with "set -e".
+
+	* configure.in: Postprocess misc/Makefile to work around another
+	automake-1.4 bug: if @EMACS@ = no, $(lispdir) is empty.
+
 2001-03-09  Bruno Haible  <haible@clisp.cons.org>
 
 	* os2/*: EMX support.
diff --git a/configure.in b/configure.in
index b498f6525..9f69ec5b2 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.13)
-AC_REVISION($Revision: 1.14 $)
+AC_REVISION($Revision: 1.15 $)
 AC_INIT(src/msgfmt.c)
 AM_INIT_AUTOMAKE(gettext, 0.10.36)
 RELEASE_DATE=2001-03-09      dnl in "date +%Y-%m-%d" format
@@ -101,9 +101,21 @@ EOF
 AC_OUTPUT([Makefile lib/Makefile intl/Makefile src/Makefile \
            po/Makefile.in doc/Makefile tests/Makefile m4/Makefile \
 	   misc/Makefile misc/gettextize], [
+  dnl Workaround an automake-1.4 bug which generates a distclean-recursive
+  dnl target in Makefile.in which causes a "make distclean" failure on FreeBSD.
+changequote(,)dnl
+  sed -e 's/test \([^ ]*\) = \([^ ]*\) \&\& /test \1 != \2 \|\| /' < Makefile \
+      > Makefile.tmp
+changequote([, ])dnl
+  mv Makefile.tmp Makefile
   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
+  dnl Workaround another automake-1.4 bug which generates incorrect install
+  dnl and uninstall targets in misc/Makefile.in.
+  sed -e "s/list='\\\$(lisp_LISP)'; for/list='\$(lisp_LISP)'; test '\$(EMACS)' = no || for/" \
+      < misc/Makefile > misc/Makefile.tmp
+  mv misc/Makefile.tmp misc/Makefile
 ])