diff options
author | William Hubbs <williamh@gentoo.org> | 2011-02-02 12:10:58 -0600 |
---|---|---|
committer | William Hubbs <w.d.hubbs@gmail.com> | 2011-02-04 17:46:57 -0600 |
commit | 19037cbd83ee46f2c3510925c83cc89d27d16ac6 (patch) | |
tree | b7bbd7d4063fed3cc892da2e994b3b35ea8ae19f /Makefile | |
parent | 21c5a022af22f9baddc14953ca5ac39715a9a649 (diff) |
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.
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 19 |
1 files changed, 7 insertions, 12 deletions
@@ -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 |