[gentoo-commits] proj/openrc:master commit in: src/librc/, init.d/, /

[gentoo-commits] proj/openrc:master commit in: src/librc/, init.d/, /

[William Hubbs]

commit:     19037cbd83ee46f2c3510925c83cc89d27d16ac6
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  2 18:10:58 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Feb  4 23:46:57 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=19037cbd

remove unnecessary shell calls

The main makefile, init.d/Makefile and src/librc/Makefile all contain
several shell calls which can be handled as make conditionals. This
switches them to conditionals.

---
 Makefile           |   19 +++++++------------
 init.d/Makefile    |    8 +++-----
 src/librc/Makefile |   29 +++++++++++++++++------------
 3 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/Makefile b/Makefile
index d2e1593..dd427d0 100644
--- a/Makefile
+++ b/Makefile
@@ -7,20 +7,15 @@ include Makefile.inc
 SUBDIR=		conf.d etc init.d local.d man scripts sh src
 
 # Build our old net foo or not
-_OLDNET_SH=	case "${MKOLDNET}" in \
-		[Yy][Ee][Ss]) echo "net doc";; \
-		*) echo "";; \
-		esac
-_OLDNET:=	$(shell ${_OLDNET_SH})
-SUBDIR+=	${_OLDNET}
+ifeq (${MKOLDNET},yes)
+SUBDIR+=	net doc
+endif
 
 # Build pkgconfig or not
-_PKGCONFIG_SH=	case "${MKPKGCONFIG}" in \
-		[Yy][Ee][Ss]|"") echo "pkgconfig";; \
-		*) echo "";; \
-		esac
-_PKGCONFIG:=	$(shell ${_PKGCONFIG_SH})
-SUBDIR+=	${_PKGCONFIG}
+MKPKGCONFIG?=	yes
+ifeq (${MKPKGCONFIG},yes)
+SUBDIR+=	pkgconfig
+endif
 
 # We need to ensure that runlevels is done last
 SUBDIR+=	runlevels

diff --git a/init.d/Makefile b/init.d/Makefile
index 29ebe59..b7490d3 100644
--- a/init.d/Makefile
+++ b/init.d/Makefile
@@ -5,11 +5,9 @@ SRCS=	bootmisc.in fsck.in hostname.in local.in localmount.in netmount.in \
 BIN=	${OBJS}
 
 # Build our old net foo or not
-_OLDNET_SH=	case "${MKOLDNET}" in \
-		[Yy][Ee][Ss]) echo "net.lo";; \
-		*) echo "";; \
-		esac
-_OLDNET:=	$(shell ${_OLDNET_SH})
+ifeq (${MKOLDNET},yes)
+_OLDNET=	net.lo
+endif
 _NET_LO=	${_OLDNET}
 
 INSTALLAFTER=	_installafter_${_NET_LO}

diff --git a/src/librc/Makefile b/src/librc/Makefile
index eb6f6fd..574aa2a 100644
--- a/src/librc/Makefile
+++ b/src/librc/Makefile
@@ -19,20 +19,25 @@ SED_CMD=	-e 's:@PREFIX@:${PREFIX}:g'
 SED_CMD+=	-e 's:@LIB@:${LIBNAME}:g'
 SED_CMD+=	-e 's:@SYSCONFDIR@:${SYSCONFDIR}:g'
 SED_CMD+=	-e 's:@LIBEXECDIR@:${LIBEXECDIR}:g'
-_PKG_PREFIX_SH=	if test -n "${PKG_PREFIX}" && test "${PKG_PREFIX}" != "/" && test "${PKG_PREFIX}" != "${PREFIX}"; then \
-		echo "-e 's:@PKG_PREFIX@:${PKG_PREFIX}:g'"; \
-		else \
-		echo "-e 's:.*@PKG_PREFIX@.*:\#undef RC_PKG_PREFIX:g'"; \
-		fi
-_PKG_PREFIX:=	$(shell ${_PKG_PREFIX_SH})
+
+_PKG_PREFIX=	-e 's:.*@PKG_PREFIX@.*:\#undef RC_PKG_PREFIX:g'
+ifneq (${PKG_PREFIX},)
+ifneq (${PKG_PREFIX},/)
+ifneq (${PKG_PREFIX},${PREFIX})
+_PKG_PREFIX=	-e 's:@PKG_PREFIX@:${PKG_PREFIX}:g'
+endif
+endif
+endif
 SED_CMD+=	${_PKG_PREFIX}
 
-_LCL_PREFIX_SH=	if test -n "${LOCAL_PREFIX}" && test "${LOCAL_PREFIX}" != "/" && test "${LOCAL_PREFIX}" != "${PREFIX}"; then \
-		echo "-e 's:@LOCAL_PREFIX@:${LOCAL_PREFIX}:g'"; \
-		else \
-		echo "-e 's:@LOCAL_PREFIX@::g'"; \
-		fi
-_LCL_PREFIX:=	$(shell ${_LCL_PREFIX_SH})
+_LCL_PREFIX=	-e 's:@LOCAL_PREFIX@::g'
+ifneq (${LOCAL_PREFIX},)
+ifneq (${LOCAL_PREFIX},/)
+ifneq (${LOCAL_PREFIX},${PREFIX})
+_LCL_PREFIX=	-e 's:@LOCAL_PREFIX@:${LOCAL_PREFIX}:g'
+endif
+endif
+endif
 SED_CMD+=	${_LCL_PREFIX}
 
 .SUFFIXES:	.h.in .h