Update for new BUILD_DIR and SRC_DIR variables

[hvlinux.git] / stage2 / pkg / iproute2

diff --git a/stage2/pkg/iproute2 b/stage2/pkg/iproute2
index 990869c..173e5d8 100644 (file)
--- a/stage2/pkg/iproute2
+++ b/stage2/pkg/iproute2
@@ -1,15 +1,27 @@
 #!/bin/bash
 
-hvbuild()
+hvconfig_pre()
 {
     # The arpd binary included in this package is dependent on Berkeley DB.
     # Because arpd is not a very common requirement on a base Linux system,
     # remove the dependency on Berkeley DB by applying the sed command below
-    sed -i '/^TARGETS/s@arpd@@g' ${LFS_TMP}/${PACKAGE}/misc/Makefile
-
-    make DESTDIR= DOCDIR=/usr/share/doc/iproute2 \
-        MANDIR=/usr/share/man
+    sed -i '/^TARGETS/s@arpd@@g' ${SRC_DIR}/misc/Makefile
+}
 
-    make DESTDIR= DOCDIR=/usr/share/doc/iproute2 \
+hvbuild()
+{
+    # DESTDIR=
+    # This ensures that the IPRoute2 binaries will install into the correct
+    # directory. By default, DESTDIR is set to /usr.
+    make DESTDIR=
+    make DESTDIR= SBINDIR=/sbin DOCDIR=/usr/share/doc/iproute2 \
         MANDIR=/usr/share/man install
 }
+
+hvbuild_post()
+{
+    unset DESTDIR
+    unset SBINDIR
+    unset DOCDIR
+    unset MANDIR
+}