-Cleaned-up name of ipkg functions in package definition files.

[hvlinux.git] / stage1 / cis-ac

diff --git a/stage1/cis-ac b/stage1/cis-ac
index cf16137..de929c3 100755 (executable)
--- a/stage1/cis-ac
+++ b/stage1/cis-ac
@@ -13,24 +13,23 @@ source ${SCRDIR}/../sysinfos
 source ${SCRDIR}/../functions
 source ${SCRDIR}/../packages-list
 
-DEFAULT_CONFIGURE_PREFIX=/tools
+# Setting default configure options for all scripts
+CONFIGURE_OPTS="\
+      --prefix=/tools \
+      --build=${CLFS_HOST} \
+      --host=${CLFS_TARGET} \
+      ${CONFIGURE_OPTS}"
 
 # Default configure function
-hvconfigure()
+hvconfig()
 {
     cd ${LFS_TMP}/${PACKAGE}-build
 
-    FINAL_CFG_OPTS="\
-      --prefix=${DEFAULT_CONFIGURE_PREFIX} \
-      --build=${CLFS_HOST} \
-      --host=${CLFS_TARGET} \
-      ${CONFIGURE_OPTS}"
-
     echo "Running configure with options:"
-    echo "  <${FINAL_CFG_OPTS}>"
+    echo "  <${CONFIGURE_OPTS}>"
 
     CC="${CC} ${CLFS_BUILDFLAGS}" CXX="${CXX} ${CLFS_BUILDFLAGS}" \
-        ../${PACKAGE}/configure ${FINAL_CFG_OPTS}
+        ../${PACKAGE}/configure ${CONFIGURE_OPTS}
 }
 
 # Default build function
@@ -56,31 +55,37 @@ fi
 hvpatch
 
 # Execute config-cache function if applicable
-if function_exists config_cache ; then
+if function_exists hvconfig_cache ; then
     echo "Running configure cache script"
-    config_cache
+    hvconfig_cache
 
     CONFIGURE_OPTS="${CONFIGURE_OPTS} --cache-file=${LFS_TMP}/${PACKAGE}-build/config.cache"
 fi
 
 # Execute pre-configure function if applicable
-if function_exists configure_pre ; then
+if function_exists hvconfig_pre ; then
     echo "Running configure pre-script"
-    configure_pre
+    hvconfig_pre
 fi
 
 if [ -n "${HV_NO_CONFIGURE_SCRIPT}" ]; then
     echo "Not calling configure because ${PACKAGE} has no configure script"
 else
-    hvconfigure
+    hvconfig
 fi
 
 # Execute post-configure function if applicable
-if function_exists configure_post ; then
+if function_exists hvconfig_post ; then
     echo "Running configure post-script"
-    configure_post
+    hvconfig_post
 fi
 
 hvbuild
 
+# Execute post-build function if applicable
+if function_exists hvbuild_post ; then
+    echo "Running build post-script"
+    hvbuild_post
+fi
+
 exit $?