commit f3699423568c2c28f40b3a203d6ca224a0c1fbf3
parent 772760a825b73c6f27a008b88f6c0f4d24b59feb
Author: Kris Maglione <kris@suckless.org>
Date: Thu, 20 May 2010 09:30:13 -0400
Fix setting $(BINSH) from config.mk
Diffstat:
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/mk/hdr.mk b/mk/hdr.mk
@@ -37,12 +37,10 @@ CTAGS=ctags
PACKAGES = 2>/dev/null
-include $(ROOT)/config.mk
-
# I hate this.
MKCFGSH=if test -f $(ROOT)/config.local.mk; then echo $(ROOT)/config.local.mk; else echo /dev/null; fi
-MKCFG:=${shell $(MKCFGSH)}
-MKCFG!=${MKCFGSH}
+MKCFG:=$(shell $(MKCFGSH))
+MKCFG!=$(MKCFGSH)
include $(MKCFG)
# and this:
@@ -54,6 +52,8 @@ BINSH := $(shell \
else echo /bin/sh; fi)
BINSH != echo /bin/sh
+include $(ROOT)/config.mk
+
.SILENT:
.SUFFIXES: .out .o .o_pic .c .pdf .sh .rc .$(SOEXT) .awk .1 .man1 .depend .install .uninstall .clean
all: