Support gmake-3 and gmake-4
authorRoy Marples <roy@marples.name>
Wed, 23 Apr 2014 16:32:29 +0000 (16:32 +0000)
committerRoy Marples <roy@marples.name>
Wed, 23 Apr 2014 16:32:29 +0000 (16:32 +0000)
GNUmakefile [new file with mode: 0644]
Makefile

diff --git a/GNUmakefile b/GNUmakefile
new file mode 100644 (file)
index 0000000..4bc845a
--- /dev/null
@@ -0,0 +1,4 @@
+# Nasty hack so that make clean works without configure being run
+CONFIG_MK?=$(shell test -e config.mk && echo config.mk || echo config-null.mk)
+
+include Makefile
index 7c0a799d4bc5349f4bee0bb117771e054bf54c05..73e449fd924c6dbac261399826972a14eb9a06e4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,9 +3,8 @@ VERSION=        3.5.6
 PKG=           ${NAME}-${VERSION}
 
 # 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})
+_CONFIG_MK!=   test -e config.mk && echo config.mk || echo config-null.mk
+CONFIG_MK?=    ${_CONFIG_MK}
 include                ${CONFIG_MK}
 
 SBINDIR?=      /sbin