[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] Release_0-3-4 ed9afe1 01/22: FIXED autoge
From: |
Kai Sterker |
Subject: |
[adonthell-wastesedge-commits] Release_0-3-4 ed9afe1 01/22: FIXED autogen.sh (no longer deletes intl/Makefile.in) |
Date: |
Mon, 25 Jul 2016 18:15:48 +0000 (UTC) |
tag: Release_0-3-4
commit ed9afe169fd22d9c1ef4e1f97ba49363e3414c4d
Author: Kai Sterker <address@hidden>
Commit: Kai Sterker <address@hidden>
FIXED autogen.sh (no longer deletes intl/Makefile.in)
---
autogen.sh | 31 +++++++++++++++++++++++++------
1 file changed, 25 insertions(+), 6 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index 173eb8b..f0687d9 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,16 +1,35 @@
#!/bin/sh
# First of all clean up the generated crud
-rm -f configure config.log config.guess config.sub config.cache
-rm -f config.status
+rm -f configure config.log config.cache
+rm -f config.status aclocal.m4
+mv intl/Makefile.in intl/Makefile.bak
rm -f `find . -name 'Makefile.in'`
+mv intl/Makefile.bak intl/Makefile.in
rm -f `find . -name 'Makefile'`
# Regenerate everything
-aclocal -I .
-automake --add-missing --gnu --copy
+
+#
+# use aclocal v1.6 if available
+#
+if test "x`which aclocal-1.6`" = "x" ; then
+ aclocal -I .
+else
+ aclocal-1.6 -I .
+fi
+
+#
+# use Autmake v1.6 if available
+#
+if test "x`which automake-1.6`" = "x" ; then
+ automake --add-missing --gnu --copy
+else
+ automake-1.6 --add-missing --gnu --copy
+fi
+
autoconf
echo
-echo "Now type './configure' to prepare Waste's Edge for installation."
-echo "Afterwards, 'make install' will install it."
+echo "Now type './configure' to prepare Adonthell for compilation."
+echo "Afterwards, 'make' will build Adonthell."
echo
- [adonthell-wastesedge-commits] Release_0-3-4 b083ac4 16/22: ADDED icons for OS X, (continued)
- [adonthell-wastesedge-commits] Release_0-3-4 b083ac4 16/22: ADDED icons for OS X, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 9ef5c12 21/22: FIXED 'make dist', Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 30906a2 17/22: IMPROVED speed of end sequence, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 c0f10e1 05/22: FIXED extro, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 f3faace 04/22: ADDED a few files used by the binary distribution for BeOS 5, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 93d678d 14/22: FIXED freezing of game right near the end, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 474606c 09/22: FIXED can't leave through door when coming through window and S. is free (thanks Leif Thande), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 e47f051 07/22: ADDED installation instructions, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 dd04699 13/22: FIXED autogen.sh to use newest versions of autotools, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 50eddcb 20/22: UPDATED ReadMe.html for italian translation, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 ed9afe1 01/22: FIXED autogen.sh (no longer deletes intl/Makefile.in),
Kai Sterker <=
- [adonthell-wastesedge-commits] Release_0-3-4 4fe3fa2 19/22: UPDATED stuff for v0.3.4, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 d26087e 08/22: FIXED missing option in Jalom's dialogue, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 184650b 22/22: FIXED (really???) end sequence bug (thanks Avanger), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 edb0cfd 10/22: Fixed a typo in Oliver's dialog (thanks Leif!), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 14dbaef 11/22: UPDATED to GNU gettext 0.13, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 c7a937a 06/22: ADDED files for MacOS X package, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 5b10e62 03/22: FIXED moving of file that wasn't there, Kai Sterker, 2016/07/25