X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;ds=sidebyside;f=functions%2Fmain;h=280123057631fac354730e45fb6c421b312c1287;hb=3a7d016a0246156de63a6f98bbf5be2e95230060;hp=35ec62ccf3e75c62333d3fea29c9af4ef08f444c;hpb=d1040a12fae93e20587519a732730cb4c9cb5050;p=hvlinux.git

diff --git a/functions/main b/functions/main
index 35ec62c..2801230 100644
--- a/functions/main
+++ b/functions/main
@@ -869,6 +869,8 @@ indicate_pkg_build_complete()
 # Remaining arguments: Additional configure options
 # Options:
 #   -c     Do not decompress package
+#   -d DIR Change to directory DIR before configuring and building.
+#   -i DIR Installation directory (for cross-compilation, stage1)
 #   -j     Disable parallel make for this package
 #   -l     Unique identification label in 'install.log'
 #          (default is package name and version)
@@ -876,8 +878,6 @@ indicate_pkg_build_complete()
 #            ac   Standard autoconf package, build in separate dir (default)
 #            acnb Standard autoconf package, build in source dir
 #            noac No autoconf (configure)
-#            gnome
-#            xorg
 #            pm
 #   -t     Enable dependency tracking
 #   -s     Name of script to source (default is from name of package)
@@ -890,16 +890,26 @@ ipkg()
     export DECOMPRESS="1"
     export IPKG_MODE="ac" # Default mode if not specified
     export HVLABEL="" # Global variable
+    export SRC_DIR="" # Global variable, source directory
+    export BUILD_DIR="" # Global variable, build directory
+    export SRC_SUBDIR="" # Global variable
+    export INSTALL_DIR="" # Global variable, installation directory
     export ENABLE_DEPENDENCY_TRACKING="0"
 
     local HVMAKE_ORIG=${HVMAKE}
 
-    while getopts "cjl:m:s:t" flag ;do
+    while getopts "cd:i:jl:m:s:t" flag ;do
         case ${flag} in
             c)
                 # Do not decompress package
                 DECOMPRESS="0"
                 ;;
+            d)
+                SRC_SUBDIR=${OPTARG}
+	        ;;
+            i)
+                INSTALL_DIR=${OPTARG}
+	        ;;
             j)
                 # Disable parallel make only for this package
                 HVMAKE="make"
@@ -911,7 +921,7 @@ ipkg()
 	    m)
                 # Installation mode
                 case ${OPTARG} in
-	            ac|acnb|noac|gnome|xorg|pm)
+	            ac|acnb|noac|pm)
                         IPKG_MODE=${OPTARG}
 	                ;;
                     *)
@@ -961,6 +971,21 @@ ipkg()
     PACKAGE_LOG=${LFS_LOG_DIR}/${HVLABEL}.log
     PACKAGE_DONE=${LFS_LOG_DIR}/${HVLABEL}.done
     PACKAGE_STATUS=${LFS_LOG_DIR}/${HVLABEL}.status
+    SRC_DIR="${LFS_TMP}/${PACKAGE}"
+    BUILD_DIR="${LFS_TMP}/${PACKAGE}"
+
+    if [ -n "${SRC_SUBDIR}" ]; then
+        SRC_DIR+="/${SRC_SUBDIR}"
+    fi
+
+    case "${IPKG_MODE}" in
+        ac)
+            BUILD_DIR="${LFS_TMP}/${PACKAGE}-build"
+	    ;;
+        acnb|noac|xpm)
+            BUILD_DIR="${SRC_DIR}"
+	    ;;
+    esac
 
     # Checking if package was previously successfully installed
     if [ -f ${PACKAGE_DONE} ]; then