X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=sim%2FMakefile.in;h=a46dda81d1d3b22ece6ec6c856b7d8f9c3ccc822;hb=2a3124caa5fb1df70668ee6028b80f261a08271a;hp=1e53780fd5de8ab69f2dba1c945ade0678bd24c0;hpb=abd8680d6efd97e7ba848a6392ee3ad72be18cd0;p=deliverable%2Fbinutils-gdb.git

diff --git a/sim/Makefile.in b/sim/Makefile.in
index 1e53780fd5..a46dda81d1 100644
--- a/sim/Makefile.in
+++ b/sim/Makefile.in
@@ -73,6 +73,10 @@ CC_FOR_BUILD = $(CC)
 # @target_makefile_frag@
 ###
 
+# Name of the ChangeLog file.
+ChangeLog = ChangeLog
+
+
 RUNTEST = `if [ -f $${srcdir}/../dejagnu/runtest ] ; then \
 		echo $${srcdir}/../dejagnu/runtest ; else echo runtest; \
 	   fi`
@@ -81,6 +85,8 @@ RUNTESTFLAGS=
 FLAGS_TO_PASS = \
 	"prefix=$(prefix)" \
 	"exec_prefix=$(exec_prefix)" \
+	"bindir=$(bindir)" \
+	"mandir=$(mandir)" \
 	"against=$(against)" \
 	"AR=$(AR)" \
 	"AR_FLAGS=$(AR_FLAGS)" \
@@ -220,16 +226,20 @@ autoconf-common autoheader-common:
 	done
 
 autoconf-changelog autoheader-changelog:
-	id="`id | sed -e 's/^[^(]*(\([^)]*\).*$$/\1/'`" ; \
-	name=`grep "^$$id:" /etc/passwd | cut -f 5 -d ':'` ; \
-	host="`hostname`" ; \
-	date="`date | sed 's/ [^ ]* \([0-9]*\)$$/ \1/'`" ; \
+	id=$(ID) ; \
+	test x$$id = x && id="`id | sed -e 's/^[^(]*(\([^)]*\).*$$/\1/'`" ; \
+	name=$(NAME) ; \
+	test x$$name = x && name=`grep "^$$id:" /etc/passwd | cut -f 5 -d ':'` ; \
+	host=$(HOST) ; \
+	test x$$host = x && host="`hostname`" ; \
+	date=$(DATE) ; \
+	test x$$date = x && date="`date +%Y-%m-%d`" ; \
 	echo "$$date $$name $$id@$$host" ; \
 	for d in * ; \
 	do \
 	    if [ -d $$d -a -f $$d/configure.in ] ; \
 	    then \
-		 echo "Creating new-ChangeLog in $$d ..." ; \
+		 echo "Creating new-$(ChangeLog) in $$d ..." ; \
 		 ( echo "$$date  $$name  <$$id@$$host>" ; \
 		   echo "" ; \
 		   echo "	* configure: Regenerated to track ../common/aclocal.m4 changes." ; \
@@ -238,8 +248,8 @@ autoconf-changelog autoheader-changelog:
 		     echo "	* config.in: Ditto." ; \
 		   fi ; \
 		   echo "" ; \
-		   cat $$d/ChangeLog \
-		 ) > $$d/new-ChangeLog ; \
+		   cat $$d/$(ChangeLog) \
+		 ) > $$d/new-$(ChangeLog) ; \
 	    fi ; \
 	done
 
@@ -248,7 +258,7 @@ autoconf-install autoheader-install:
 	do \
 	    if [ -d $$d -a -f $$d/configure.in ] ; \
 	    then \
-		 echo "Moving $$d/new-ChangeLog to $$d/ChangeLog ..." ; \
-		 mv $$d/new-ChangeLog $$d/ChangeLog ; \
+		 echo "Moving $$d/new-$(ChangeLog) to $$d/$(ChangeLog) ..." ; \
+		 mv $$d/new-$(ChangeLog) $$d/$(ChangeLog) ; \
 	    fi ; \
 	done