diff options
| author | Roy Marples <roy@marples.name> | 2014-04-23 16:00:50 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2014-04-23 16:00:50 +0000 |
| commit | c9beb7cc29899f74ebb638f38f3f23516bc2dc6f (patch) | |
| tree | 4ace1443195a60af9571fcfa5adaf27032258819 /Makefile | |
| parent | f3d23eb267c24f2e77b99302607aec86295507e7 (diff) | |
| download | dhcpcd-c9beb7cc29899f74ebb638f38f3f23516bc2dc6f.tar.xz | |
gmake-4 supports != shell assignment operator, like BSD make.
This breaks our hack to support both, so workaround by using GNUmakefile at
the toplevel.
Note that building a source release now requires BSD make or gmake-4
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 16 |
1 files changed, 4 insertions, 12 deletions
@@ -9,11 +9,8 @@ CFLAGS?= -O2 CSTD?= c99 MKDIRS= -# Nasty hack so that make clean works without configure being run -_CONFIG_MK_SH= test -e config.mk && echo config.mk || echo config-null.mk -_CONFIG_MK!= ${_CONFIG_MK_SH} -CONFIG_MK= ${_CONFIG_MK}$(shell ${_CONFIG_MK_SH}) -include ${CONFIG_MK} +TOP?= . +include ${TOP}/iconfig.mk CFLAGS+= -std=${CSTD} @@ -56,13 +53,8 @@ SED_SERVICESTATUS= -e 's:@SERVICESTATUS@:${SERVICESTATUS}:g' SED_SCRIPT= -e 's:@SCRIPT@:${SCRIPT}:g' SED_SYS= -e 's:@SYSCONFDIR@:${SYSCONFDIR}:g' -_DEPEND_SH= test -e .depend && echo ".depend" || echo "" -_DEPEND!= ${_DEPEND_SH} -DEPEND= ${_DEPEND}$(shell ${_DEPEND_SH}) - -_VERSION_SH= sed -n 's/\#define VERSION[[:space:]]*"\(.*\)".*/\1/p' defs.h -_VERSION!= ${_VERSION_SH} -VERSION= ${_VERSION}$(shell ${_VERSION_SH}) +DEPEND!= test -e .depend && echo ".depend" || echo "" +VERSION!= sed -n 's/\#define VERSION[[:space:]]*"\(.*\)".*/\1/p' defs.h FOSSILID?= current |