Merge stage1 x86_64 dans trunk

[hvlinux.git] / stage4 / cis-gnome

diff --git a/stage4/cis-gnome b/stage4/cis-gnome
index b6297eb..b381577 100755 (executable)
--- a/stage4/cis-gnome
+++ b/stage4/cis-gnome
@@ -1,24 +1,28 @@
 #!/bin/sh
-# First argument of this script is the package name
+# First argument of this script is the package name.
+# Remaining arguments are additional configure options.
 
 # Reading system configuration informations, functions and package versions.
 source ../sysinfos
 source ../functions
 source ../packages-list
 
+PACKAGE=${1}
+shift
+CONFIGURE_OPTS=${*}
+
 # Applying patches (if any)
-apply_patches ${1} &&
+apply_patches ${PACKAGE} &&
 
-cd ${LFS_TMP}/${1}-build &&
-../${1}/configure \
+cd ${LFS_TMP}/${PACKAGE}-build &&
+../${PACKAGE}/configure \
     --prefix=${GNOME2_PREFIX} \
     --libexecdir=${GNOME2_PREFIX}/sbin \
-    --infodir=${GNOME2_PREFIX}/share/info \
+    --sysconfdir=/etc/gnome/${GNOME2_VER} \
     --localstatedir=/var/lib \
-    --sysconfdir=/etc/gnome/${GNOME2_VER} &&
+    ${CONFIGURE_OPTS} &&
 make &&
 make install &&
 ldconfig
 
-# Return last error
 exit $?