Upgrades to packages

[hvlinux.git] / stage4 / cis-iso-codes

diff --git a/stage4/cis-iso-codes b/stage4/cis-iso-codes
index 54884db..1e62131 100755 (executable)
--- a/stage4/cis-iso-codes
+++ b/stage4/cis-iso-codes
@@ -1,18 +1,26 @@
 #!/bin/sh
 # 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} &&
-./autogen.sh --prefix=/usr &&
+cd ${LFS_TMP}/${PACKAGE}-build &&
+../${PACKAGE}/configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    ${CONFIGURE_OPTS} &&
 make &&
-make install &&
+make pkgconfigdir=/usr/lib/pkgconfig install &&
 ldconfig
 
 # Return last error