From 34cb1cc610f71fb880a2a767061aade29e93a983 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 21 Mar 2011 20:28:41 -0700 Subject: [PATCH] copy_autogen tweaks. * autogen/copy_autogen: Work from ./ or ../. Fix time-stamps. * autogen.sh: Doc fix. --- ChangeLog | 6 ++++++ autogen.sh | 2 +- autogen/copy_autogen | 9 +++++++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index a58a60465d..d13832b906 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-03-22 Glenn Morris + + * autogen/copy_autogen: Work from ./ or ../. + Fix time-stamps. + * autogen.sh: Doc fix. + 2011-03-20 Glenn Morris * autogen/: New directory, to be excluded from releases. diff --git a/autogen.sh b/autogen.sh index a56b8d7782..03c39ee945 100755 --- a/autogen.sh +++ b/autogen.sh @@ -184,7 +184,7 @@ instead of this script. If all else fails, you can try using the pre-built versions of the generated files by doing: -cd autogen && ./copy_autogen +./autogen/copy_autogen This is not recommended - see the comments in \`copy_autogen'. diff --git a/autogen/copy_autogen b/autogen/copy_autogen index 4abdbd87c0..2096636c38 100755 --- a/autogen/copy_autogen +++ b/autogen/copy_autogen @@ -8,12 +8,17 @@ ## regenerate configure and will fail if you do not have the required ## tools. You will have to run this script again. +test -d autogen && cd autogen + if test ! -e config.in; then - echo "You must run this script from the autogen/ directory." + echo "Cannot find autogen/ directory." exit 1 fi -cp configure aclocal.m4 ../ +## Order implied by top-level Makefile's rules, for time-stamps. +cp aclocal.m4 ../ +cp configure ../ +touch ../src/stamp-h.in cp config.in ../src/ cp Makefile.in ../lib/ -- 2.39.2