From d4c71415a9514c3d478e6ed110cba72a0d80a378 Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Fri, 17 Apr 2009 23:23:31 +0000 Subject: Add MKOLDNET=yes/no toggle --- Makefile | 12 +++++++++++- README | 1 + init.d/Makefile | 19 +++++++++++++++---- 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 17e844e0..b4635a57 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,17 @@ NAME= openrc VERSION= 0.4.3 PKG= ${NAME}-${VERSION} -SUBDIR= conf.d doc etc init.d man net sh src +SUBDIR= conf.d etc init.d man sh src + +# Build our old net foo or not +MKOLDNET?= yes +_OLDNET_SH= case "${MKOLDNET}" in \ + [Yy][Ee][Ss]) echo "net doc";; \ + *) echo "";; \ + esac +_OLDNET!= ${_OLDNET_SH} +SUBDIR+= ${_OLDNET}$(shell ${_OLDNET_SH}) + # We need to ensure that runlevels is done last SUBDIR+= runlevels diff --git a/README b/README index 2c61b0c0..547885f0 100644 --- a/README +++ b/README @@ -13,6 +13,7 @@ DESTDIR=/tmp/openrc-image MKPAM=pam MKTERMCAP=ncurses MKTERMCAP=termcap +MKOLDNET=no PKG_PREFIX=/usr/pkg LOCAL_PREFIX=/usr/local PREFIX=/usr/local diff --git a/init.d/Makefile b/init.d/Makefile index d3c7cf1b..19f5946e 100644 --- a/init.d/Makefile +++ b/init.d/Makefile @@ -3,14 +3,25 @@ SRCS= bootmisc.in fsck.in hostname.in local.in localmount.in netmount.in \ network.in root.in savecache.in swap.in sysctl.in urandom.in BIN= ${OBJS} -INSTALLAFTER= _installafter -CLEANFILES+= net.lo -TARGETS+= net.lo +# Build our old net foo or not +MKOLDNET?= yes +_OLDNET_SH= case "${MKOLDNET}" in \ + [Yy][Ee][Ss]) echo "net.lo";; \ + *) echo "";; \ + esac +_OLDNET!= ${_OLDNET_SH} +_NET_LO= ${_OLDNET}$(shell ${_OLDNET_SH}) + +INSTALLAFTER= _installafter_${_NET_LO} +CLEANFILES+= ${_NET_LO} +TARGETS+= ${_NET_LO} MK= ../mk include ${MK}/os.mk include Makefile.${OS} include ${MK}/scripts.mk -_installafter: realinstall +_installafter_: realinstall + +_installafter_net.lo: realinstall ${INSTALL} -m ${BINMODE} net.lo ${DESTDIR}/${INITDIR}/${NET_LO} -- cgit v1.2.3