[Emacs-diffs] /srv/bzr/emacs/trunk r103710: copy_autogen tweaks.

[Glenn Morris]

------------------------------------------------------------
revno: 103710
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2011-03-21 20:28:41 -0700
message:
  copy_autogen tweaks.
  
  * autogen/copy_autogen: Work from ./ or ../.
  Fix time-stamps.
  * autogen.sh: Doc fix.
modified:
  ChangeLog
  autogen.sh
  autogen/copy_autogen

=== modified file 'ChangeLog'
--- a/ChangeLog 2011-03-20 23:58:23 +0000
+++ b/ChangeLog 2011-03-22 03:28:41 +0000
@@ -1,3 +1,9 @@
+2011-03-22  Glenn Morris  <address@hidden>
+
+       * autogen/copy_autogen: Work from ./ or ../.
+       Fix time-stamps.
+       * autogen.sh: Doc fix.
+
 2011-03-20  Glenn Morris  <address@hidden>
 
        * autogen/: New directory, to be excluded from releases.

=== modified file 'autogen.sh'
--- a/autogen.sh        2011-03-20 23:58:23 +0000
+++ b/autogen.sh        2011-03-22 03:28:41 +0000
@@ -184,7 +184,7 @@
 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'.
 

=== modified file 'autogen/copy_autogen'
--- a/autogen/copy_autogen      2011-03-20 23:58:23 +0000
+++ b/autogen/copy_autogen      2011-03-22 03:28:41 +0000
@@ -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/