X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=functions%2Fipkg;h=61ba49238cf1bef267b251d8b3f32193fb6f3200;hb=3a7d016a0246156de63a6f98bbf5be2e95230060;hp=b30a2e70be2b3b29516c231b95c43e060a431ed5;hpb=247bd6736180cd47e5a7e6745236305783bc3e1b;p=hvlinux.git

diff --git a/functions/ipkg b/functions/ipkg
index b30a2e7..61ba492 100644
--- a/functions/ipkg
+++ b/functions/ipkg
@@ -24,13 +24,24 @@ unset -f hvconfig_cache
 unset -f hvconfig_post
 unset -f hvbuild_post
 
-ipkg_decompress_package()
+# Arg #1: Clean label for debug message (optional)
+function dir_cleanup()
 {
     # Removing old build directory (if any)
     if [ -d ${LFS_TMP}/${PACKAGE} ]; then
-        echo "Removing old build directory"
+        echo "Removing ${1} source directory"
 	rm -rf ${LFS_TMP}/${PACKAGE}
     fi
+    if [ -d ${LFS_TMP}/${PACKAGE}-build ]; then
+        echo "Removing ${1} build directory"
+        rm -rf ${LFS_TMP}/${PACKAGE}-build
+    fi
+}
+
+ipkg_decompress_package()
+{
+    # Removing old source and build directories (if any)
+    dir_cleanup "old"
 
     echo "Decompressing package"
     decompress_package ${PACKAGE}
@@ -79,9 +90,13 @@ hvconfig()
 # Default build function
 hvbuild()
 {
-    cd ${BUILD_DIR}
     ${HVMAKE}
-    ${HVMAKE} install
+
+    if [ -n "${INSTALL_DIR}" ]; then
+        ${HVMAKE} DESTDIR=${INSTALL_DIR} install
+    else
+        ${HVMAKE} install
+    fi
 }
 
 # Default patch applying function
@@ -108,15 +123,7 @@ ipkg_finish()
 
         # Some scripts need to preserve the source or build directory. They can
         # do so by renaming them.
-        if [ -d ${LFS_TMP}/${PACKAGE} ]; then
-	    # Removing source directory
-            echo "Removing source directory"
-	    rm -rf ${LFS_TMP}/${PACKAGE}
-        fi
-        if [ -d ${LFS_TMP}/${PACKAGE}-build ]; then
-            echo "Removing build directory"
-            rm -rf ${LFS_TMP}/${PACKAGE}-build
-        fi
+        dir_cleanup
     else
         BUILD_SIZE="Unknown"
     fi
@@ -210,6 +217,9 @@ ipkg_script()
         hvconfig_post
     fi
 
+    if [ -d ${BUILD_DIR} ]; then
+        cd ${BUILD_DIR}
+    fi
     hvbuild
 
     # Execute post-build function if applicable