Fix setting $(BINSH) from config.mk

This commit is contained in:
Kris Maglione 2010-05-20 09:30:13 -04:00
parent 772760a825
commit f369942356

View File

@ -37,12 +37,10 @@ CTAGS=ctags
PACKAGES = 2>/dev/null PACKAGES = 2>/dev/null
include $(ROOT)/config.mk
# I hate this. # I hate this.
MKCFGSH=if test -f $(ROOT)/config.local.mk; then echo $(ROOT)/config.local.mk; else echo /dev/null; fi MKCFGSH=if test -f $(ROOT)/config.local.mk; then echo $(ROOT)/config.local.mk; else echo /dev/null; fi
MKCFG:=${shell $(MKCFGSH)} MKCFG:=$(shell $(MKCFGSH))
MKCFG!=${MKCFGSH} MKCFG!=$(MKCFGSH)
include $(MKCFG) include $(MKCFG)
# and this: # and this:
@ -54,6 +52,8 @@ BINSH := $(shell \
else echo /bin/sh; fi) else echo /bin/sh; fi)
BINSH != echo /bin/sh BINSH != echo /bin/sh
include $(ROOT)/config.mk
.SILENT: .SILENT:
.SUFFIXES: .out .o .o_pic .c .pdf .sh .rc .$(SOEXT) .awk .1 .man1 .depend .install .uninstall .clean .SUFFIXES: .out .o .o_pic .c .pdf .sh .rc .$(SOEXT) .awk .1 .man1 .depend .install .uninstall .clean
all: all: