diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-09-17 15:35:28 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-09-17 15:35:28 -0700 |
| commit | dee26dfa11ac3936c84f42b83a0e1ec7ae2b15f9 (patch) | |
| tree | 3422e706b3df5a1d1590ec125a57377bf72035d1 /autogen | |
| parent | 50bfc8243c7385f7e795bca26b539f57c167170c (diff) | |
| download | emacs-dee26dfa11ac3936c84f42b83a0e1ec7ae2b15f9.tar.gz | |
* Makefile.in: Run autogen/copy_autogen if autogen.sh fails,
to create 'configure'; problem reported by Andreas Schwab in
<http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00438.html>.
* autogen.sh: Exit with status 1 when failing due to missing tools,
reverting the 2012-09-10 change to this file.
* autogen/copy_autogen: Fail if one of the subsidiary actions fail.
Use 'cp -f' for the build-aux files, since the destinations are
typically read-only.
Diffstat (limited to 'autogen')
| -rwxr-xr-x | autogen/copy_autogen | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/autogen/copy_autogen b/autogen/copy_autogen index b6af9b6eb35..8aacd4d399a 100755 --- a/autogen/copy_autogen +++ b/autogen/copy_autogen @@ -8,7 +8,7 @@ ## 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 +test ! -d autogen || cd autogen || exit if test ! -e config.in; then echo "Cannot find autogen/ directory." @@ -16,11 +16,12 @@ if test ! -e config.in; then fi ## Order implied by top-level Makefile's rules, for time-stamps. -cp compile config.guess config.sub depcomp install-sh missing ../build-aux -cp aclocal.m4 ../ -cp configure ../ -touch ../src/stamp-h.in -cp config.in ../src/ -cp Makefile.in ../lib/ +cp -f compile config.guess config.sub depcomp install-sh missing \ + ../build-aux && +cp aclocal.m4 ../ && +cp configure ../ && +touch ../src/stamp-h.in && +cp config.in ../src/ && +cp Makefile.in ../lib/ && echo "You can now run configure" |