Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (ae9d828865ce8cdd42fbd474330fe6b292b98ee7)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (ae9d828865ce8cdd42fbd474330fe6b292b98ee7)
  • Date: Tue, 24 Oct 2006 21:15:49 -0500

GIT changes to master grimoire by George Sherwood <chat AT sourcemage.org>:

e/eterm/DEPENDS | 3 ++-
e/eterm/HISTORY | 4 ++++
e/eterm/PRE_BUILD | 4 +++-
3 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit ae9d828865ce8cdd42fbd474330fe6b292b98ee7
Author: George Sherwood <chat AT sourcemage.org>
Commit: George Sherwood <chat AT sourcemage.org>

eterm: Updated to use automake-1.9. Doesn't work yet with 1.10.

diff --git a/e/eterm/DEPENDS b/e/eterm/DEPENDS
index 4d3ca25..fa9b8c2 100755
--- a/e/eterm/DEPENDS
+++ b/e/eterm/DEPENDS
@@ -1,7 +1,8 @@
depends libast &&

if [ "$ETERM_CVS" = "y" ]; then
- depends CVS
+ depends CVS &&
+ depends automake-1.9
fi &&

optional_depends imlib2 \
diff --git a/e/eterm/HISTORY b/e/eterm/HISTORY
index 94a439e..55c96cf 100644
--- a/e/eterm/HISTORY
+++ b/e/eterm/HISTORY
@@ -1,3 +1,7 @@
+2006-10-25 George Sherwood <george AT beernabeer.com>
+ * DEPENDS: if cvs depends automake-1.9
+ * PRE_BUILD: force use of automake-1.9.
+
2006-08-31 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.9.4, removed UPDATED
* PRE_BUILD, eterm-0.9.3-gcc4.patch: removed patch
diff --git a/e/eterm/PRE_BUILD b/e/eterm/PRE_BUILD
index 649d2b5..7e5d75e 100755
--- a/e/eterm/PRE_BUILD
+++ b/e/eterm/PRE_BUILD
@@ -3,5 +3,7 @@ cd ${SOURCE_DIRECTORY} &&
unpack_file '2' &&

if [ "${ETERM_CVS}" == "y" ]; then
- NOCONFIGURE=Y ./autogen.sh
+sedit "s/\$ACLOCAL aclocal/\$ACLOCAL aclocal-1.9/" autogen.sh &&
+sedit "s/\$AUTOMAKE automake/\$AUTOMAKE automake-1.9/" autogen.sh &&
+ NOCONFIGURE=Y ./autogen.sh
fi



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (ae9d828865ce8cdd42fbd474330fe6b292b98ee7), George Sherwood, 10/24/2006

Archive powered by MHonArc 2.6.24.

Top of Page