[SM-Commit] GIT changes to master grimoire by Arjan Bouter (fae89f8153ea96e9e0b4e37a66537db138d06c2b)

Arjan Bouter scm at sourcemage.org
Tue Nov 3 10:47:27 EST 2009


GIT changes to master grimoire by Arjan Bouter <abouter at sourcemage.org>:

 smgl/upstart/BUILD     |   14 ++++++++------
 smgl/upstart/HISTORY   |    5 +++++
 smgl/upstart/PRE_BUILD |    3 +++
 3 files changed, 16 insertions(+), 6 deletions(-)

New commits:
commit fae89f8153ea96e9e0b4e37a66537db138d06c2b
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    upstart: cleaned up install dirs and skip installing sysvcompat scripts.
    those are handled by smgl-upstart

diff --git a/smgl/upstart/BUILD b/smgl/upstart/BUILD
index 50aca53..caeaaf0 100755
--- a/smgl/upstart/BUILD
+++ b/smgl/upstart/BUILD
@@ -1,7 +1,9 @@
-./configure     --prefix=${INSTALL_ROOT}/                \
-            --sysconfdir=${INSTALL_ROOT}/etc             \
-         --localstatedir=${INSTALL_ROOT}/var             \
-                --mandir=${INSTALL_ROOT}/usr/share/man   \
-               --infodir=${INSTALL_ROOT}/usr/share/info  \
-                         $OPTS                           &&
+./configure     --prefix=${INSTALL_ROOT}/ \
+            --sysconfdir=${INSTALL_ROOT}/etc \
+         --localstatedir=${INSTALL_ROOT}/var \
+                --mandir=${INSTALL_ROOT}/usr/share/man \
+               --infodir=${INSTALL_ROOT}/usr/share/info \
+            --includedir=${INSTALL_ROOT}/usr/include \
+             --localedir=${INSTALL_ROOT}/usr/share/locale \
+                         $OPTS &&
 make
diff --git a/smgl/upstart/HISTORY b/smgl/upstart/HISTORY
index e554d03..685f785 100644
--- a/smgl/upstart/HISTORY
+++ b/smgl/upstart/HISTORY
@@ -1,3 +1,8 @@
+2009-11-03 Arjan Bouter <abouter at sourcemage.org>
+	* BUILD: specify locale and include dirs
+	* PRE_BUILD: added to skip installing sysv compatible initscripts.
+	  those are handled by smgl-upstart
+
 2009-09-07 Arjan Bouter <abouter at sourcemage.org>
 	* DEPENDS: added expat
 	* BUILD: remove upstart- prefix and install into INSTALL_ROOT/
diff --git a/smgl/upstart/PRE_BUILD b/smgl/upstart/PRE_BUILD
new file mode 100755
index 0000000..bbb1de0
--- /dev/null
+++ b/smgl/upstart/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+sedit 's/util conf doc/util doc/' Makefile.in



More information about the SM-Commit mailing list