From: Stepan Kasal Date: Tue, 24 May 2005 06:14:27 +0000 (+0000) Subject: Merge the two rules for creating scripts. X-Git-Tag: AUTOCONF-2.59c~378 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b3856e4df033b206c79375f083ed89f60c9c2ea;p=thirdparty%2Fautoconf.git Merge the two rules for creating scripts. --- diff --git a/ChangeLog b/ChangeLog index e32154c3b..076e12435 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-05-24 Stepan Kasal + + * bin/Makefile.am: Merge the two rules for creating scripts. + 2005-05-23 Stepan Kasal * lib/autoconf/general.m4 (AC_MSG_RESULT_UNQUOTED): Make diff --git a/bin/Makefile.am b/bin/Makefile.am index 05ad01e2f..10c928fea 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -55,17 +55,18 @@ edit = sed \ autoconf.in: $(srcdir)/autoconf.as $(m4sh_m4f_dependencies) $(MY_AUTOM4TE) --language M4sh --cache '' $(srcdir)/autoconf.as -o $@ -## All the files below depend on Makefile so that they are rebuilt -## when the prefix etc. changes. It took quite a while to have these -## rules correct, don't break them! +## All the scripts depend on Makefile so that they are rebuilt when the +## prefix etc. changes. It took quite a while to have the rule correct, +## don't break it! ## Use chmod -w to prevent people from editing the wrong file by accident. -autoheader autom4te autoreconf autoscan autoupdate ifnames: Makefile +$(bin_SCRIPTS): Makefile rm -f $@ $@.tmp - $(edit) $(srcdir)/$@.in >$@.tmp + $(edit) `test -f ./$@.in || echo $(srcdir)/`$@.in >$@.tmp chmod +x $@.tmp chmod a-w $@.tmp mv $@.tmp $@ +autoconf: autoconf.in autoheader: $(srcdir)/autoheader.in autom4te: $(srcdir)/autom4te.in autoreconf: $(srcdir)/autoreconf.in @@ -73,14 +74,6 @@ autoscan: $(srcdir)/autoscan.in autoupdate: $(srcdir)/autoupdate.in ifnames: $(srcdir)/ifnames.in -# autoconf.in is in ., not in $(srcdir). -autoconf: autoconf.in Makefile - rm -f $@ $@.tmp - $(edit) $@.in >$@.tmp - chmod +x $@.tmp - chmod a-w $@.tmp - mv $@.tmp $@ - ## --------------- ## ## Building TAGS. ##