From: Bruno Haible Date: Tue, 11 Dec 2001 13:01:01 +0000 (+0000) Subject: Tweak po/Makefile construction. X-Git-Tag: v0.11~203 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6222209130749e2df7c9f4232fdae9b103b3c37;p=thirdparty%2Fgettext.git Tweak po/Makefile construction. --- diff --git a/m4/ChangeLog b/m4/ChangeLog index cde99555f..a8e996980 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,8 @@ +2001-12-11 Bruno Haible + + * gettext.m4 (AM_PO_SUBDIRS): Don't insert obsolete Rules-* files into + the Makefile. + 2001-12-03 Bruno Haible * gettext.m4 (AM_PO_SUBDIRS): Fix construction of Makefile if diff --git a/m4/gettext.m4 b/m4/gettext.m4 index b700efa01..a1f79d928 100644 --- a/m4/gettext.m4 +++ b/m4/gettext.m4 @@ -373,7 +373,10 @@ AC_DEFUN([AM_PO_SUBDIRS], sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" for f in "$ac_dir"/Rules-*; do if test -f "$f"; then - cat "$f" >> "$ac_dir/Makefile" + case "$f" in + *.orig | *.bak | *~) ;; + *) cat "$f" >> "$ac_dir/Makefile" ;; + esac fi done fi