X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage2%2Fpkg%2Fiproute2;h=7c937b32d73fdadd52834dff03883fd1b2d7178e;hb=d1040a12fae93e20587519a732730cb4c9cb5050;hp=855c1f76059014999105dbe9179dd3a617c1ffb0;hpb=3605ab38ca7604b1fe43c3bce5e4963730a85d39;p=hvlinux.git

diff --git a/stage2/pkg/iproute2 b/stage2/pkg/iproute2
index 855c1f7..7c937b3 100644
--- a/stage2/pkg/iproute2
+++ b/stage2/pkg/iproute2
@@ -1,17 +1,29 @@
 #!/bin/bash
 
-HV_NO_CONFIGURE_SCRIPT=1
-
-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
+hvbuild()
+{
+    cd ${LFS_TMP}/${PACKAGE}
 
-    make DESTDIR= DOCDIR=/usr/share/doc/iproute2 \
+    # 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
+}