2005-02-01  Stepan Kasal  <address@hidden>

	* bin/Makefile.am: Merge the two rules for creating scripts.

Index: bin/Makefile.am
===================================================================
RCS file: /cvsroot/autoconf/autoconf/bin/Makefile.am,v
retrieving revision 1.21
diff -u -r1.21 Makefile.am
--- bin/Makefile.am	11 Dec 2004 01:24:56 -0000	1.21
+++ bin/Makefile.am	1 Feb 2005 15:12:00 -0000
@@ -2,7 +2,7 @@
 
 ## Makefile for Autoconf.
 
-## Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software
+## Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software
 ## Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
@@ -55,17 +55,20 @@
 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!
+autoconf_in_generated = yes
+
+## 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 $@ address@hidden
-	$(edit) $(srcdir)/address@hidden >address@hidden
+	$(edit) `test -n "$(address@hidden)" || echo $(srcdir)/address@hidden >address@hidden
 	chmod +x address@hidden
 	chmod a-w address@hidden
 	mv address@hidden $@
 
+autoconf: autoconf.in
 autoheader: $(srcdir)/autoheader.in
 autom4te: $(srcdir)/autom4te.in
 autoreconf: $(srcdir)/autoreconf.in
@@ -73,14 +76,6 @@
 autoupdate: $(srcdir)/autoupdate.in
 ifnames: $(srcdir)/ifnames.in
 
-# autoconf.in is in ., not in $(srcdir).
-autoconf: autoconf.in Makefile
-	rm -f $@ address@hidden
-	$(edit) address@hidden >address@hidden
-	chmod +x address@hidden
-	chmod a-w address@hidden
-	mv address@hidden $@
-
 
 ## --------------- ##
 ## Building TAGS.  ##