diff options
Diffstat (limited to 'source/n/iproute2/iproute2.SlackBuild')
| -rwxr-xr-x | source/n/iproute2/iproute2.SlackBuild | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source/n/iproute2/iproute2.SlackBuild b/source/n/iproute2/iproute2.SlackBuild index 65415b864..48ce07ae0 100755 --- a/source/n/iproute2/iproute2.SlackBuild +++ b/source/n/iproute2/iproute2.SlackBuild @@ -82,7 +82,8 @@ find . \ make \ CCOPTS="$SLKCFLAGS" \ LIBDIR=/usr/lib${LIBDIRSUFFIX} \ - CONFDIR=/etc/iproute2 \ + CONF_ETC_DIR?=/etc/iproute2 \ + CONF_USR_DIR?=/usr/lib/iproute2 \ DOCDIR=/usr/doc/iproute2-$VERSION \ MANDIR=/usr/man \ DBM_INCLUDE=/usr/include/db48 \ @@ -90,7 +91,8 @@ make \ make install \ LIBDIR=/usr/lib${LIBDIRSUFFIX} \ - CONFDIR=/etc/iproute2 \ + CONF_ETC_DIR?=/etc/iproute2 \ + CONF_USR_DIR?=/usr/lib/iproute2 \ DOCDIR=/usr/doc/iproute2-$VERSION \ MANDIR=/usr/man \ DBM_INCLUDE=/usr/include/db48 \ @@ -99,6 +101,9 @@ make install \ mkdir -p $PKG/usr make install LIBDIR=/usr/lib${LIBDIRSUFFIX} DESTDIR=$PKG/usr/ || exit 1 +# Add a configuration override directory: +mkdir -p $PKG/etc/iproute2 + # This stuff has always been installed under /sbin rather than # /usr/sbin, as the latter could possibly be network-mounted, and # these utilities may be needed to set up that network, so move @@ -113,7 +118,7 @@ mv $PKG/usr/sbin/* $PKG/sbin ) # Don't clobber existing config files -for file in $PKG/etc/iproute2/* ; do +for file in $PKG/usr/lib/iproute2/* ; do mv $file ${file}.new done @@ -158,4 +163,3 @@ zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $TMP/iproute2-$(echo $VERSION | tr - _)-$ARCH-$BUILD.txz - |