From: Alexandre Duret-Lutz Date: Tue, 19 Jul 2005 19:19:17 +0000 (+0000) Subject: * Makefile.am (automake, aclocal): Merge the rules. X-Git-Tag: Release-1-9b~129 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7fbd4d4166cce8362d8a8166036159ab3af2a367;p=thirdparty%2Fautomake.git * Makefile.am (automake, aclocal): Merge the rules. --- diff --git a/ChangeLog b/ChangeLog index bbf75d952..4de1392f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-07-19 Stepan Kasal + + * Makefile.am (automake, aclocal): Merge the rules. + 2005-07-10 Alexandre Duret-Lutz * lib/config.guess, lib/config.sub, lib/texinfo.tex: New upstream diff --git a/Makefile.am b/Makefile.am index 17b4a4e36..595dacb1c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -77,16 +77,11 @@ do_subst = sed \ ## These files depend on Makefile so they are rebuilt if $(VERSION), ## $(datadir) or other do_subst'ituted variables change. ## Use chmod a-w to prevent people from editing the wrong file by accident. -automake: automake.in Makefile +automake: automake.in +aclocal: aclocal.in +automake aclocal: Makefile rm -f $@ $@.tmp - $(do_subst) $(srcdir)/automake.in >$@.tmp - chmod +x $@.tmp - chmod a-w $@.tmp - mv -f $@.tmp $@ - -aclocal: aclocal.in Makefile - rm -f $@ $@.tmp - $(do_subst) $(srcdir)/aclocal.in >$@.tmp + $(do_subst) $(srcdir)/$@.in >$@.tmp chmod +x $@.tmp chmod a-w $@.tmp mv -f $@.tmp $@ diff --git a/Makefile.in b/Makefile.in index 9c6be60b1..8f223d926 100644 --- a/Makefile.in +++ b/Makefile.in @@ -660,16 +660,11 @@ uninstall-hook: rm -f $(DESTDIR)$(bindir)/$$fv; \ done -automake: automake.in Makefile +automake: automake.in +aclocal: aclocal.in +automake aclocal: Makefile rm -f $@ $@.tmp - $(do_subst) $(srcdir)/automake.in >$@.tmp - chmod +x $@.tmp - chmod a-w $@.tmp - mv -f $@.tmp $@ - -aclocal: aclocal.in Makefile - rm -f $@ $@.tmp - $(do_subst) $(srcdir)/aclocal.in >$@.tmp + $(do_subst) $(srcdir)/$@.in >$@.tmp chmod +x $@.tmp chmod a-w $@.tmp mv -f $@.tmp $@