[SM-Commit] GIT changes to master grimoire by Ethan Grammatikidis (8945db3df34f2fc58f0f9f782285ca2a3d1c7e93)

Ethan Grammatikidis scm at sourcemage.org
Sat Dec 27 14:43:47 EST 2008


GIT changes to master grimoire by Ethan Grammatikidis <eekee57 at fastmail.fm>:

 windowmanagers/sawfish/BUILD     |    3 +++
 windowmanagers/sawfish/HISTORY   |    7 +++++++
 windowmanagers/sawfish/PRE_BUILD |    4 ----
 3 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 8945db3df34f2fc58f0f9f782285ca2a3d1c7e93
Author: Ethan Grammatikidis <eekee57 at fastmail.fm>
Commit: Ethan Grammatikidis <eekee57 at fastmail.fm>

    sawfish: duplicate execution of configure is actually necessary

commit d7f87d98db77334c23812e36733ad1488b8c1537
Author: Ethan Grammatikidis <eekee57 at fastmail.fm>
Commit: Ethan Grammatikidis <eekee57 at fastmail.fm>

    sawfish: forgot &&

commit a8ed2e9219ca14346e3f69f13cfa2eefa16b382e
Author: Ethan Grammatikidis <eekee57 at fastmail.fm>
Commit: Ethan Grammatikidis <eekee57 at fastmail.fm>

    sawfish: CSM path: moved autogen.sh back to BUILD and build safely

diff --git a/windowmanagers/sawfish/BUILD b/windowmanagers/sawfish/BUILD
index 0242d78..3e52379 100755
--- a/windowmanagers/sawfish/BUILD
+++ b/windowmanagers/sawfish/BUILD
@@ -1,2 +1,5 @@
 export CPPFLAGS="-I/usr/include/freetype2" &&
+if [ "${SAWFISH_CVS}" == "y" ] ; then
+  ./autogen.sh $OPTS
+fi &&
 default_build
diff --git a/windowmanagers/sawfish/HISTORY b/windowmanagers/sawfish/HISTORY
index 82e2238..0964f12 100644
--- a/windowmanagers/sawfish/HISTORY
+++ b/windowmanagers/sawfish/HISTORY
@@ -1,6 +1,13 @@
 2008-12-27 Ethan Grammatikidis <eekee57 at fastmail.fm>
 	* PRE_BUILD, BUILD: autogen.sh execution moved to PRE_BUILD
 	* DEPENDS: whitespace cleanup (sorry, had to to be able to read it)
+	* PRE_BUILD, BUILD: autogen.sh execution moved back to BUILD as
+	  it forces configure to run. configure options are now passed
+	  to autogen.sh and make is executed directly, to avoid unnecessary
+	  duplication and/or failure of configure.
+	* PRE_BUILD: removed
+	* BUILD: unnecessary duplication of configure reinstated thanks to
+	  sorcery opacity.
 
 2008-12-26 Ethan Grammatikidis <eekee57 at fastmail.fm>
 	* DETAILS: corrected WEB_SITE
diff --git a/windowmanagers/sawfish/PRE_BUILD b/windowmanagers/sawfish/PRE_BUILD
deleted file mode 100755
index c0d4a41..0000000
--- a/windowmanagers/sawfish/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-if [ "${SAWFISH_CVS}" == "y" ] ; then
-  ./autogen.sh
-fi



More information about the SM-Commit mailing list