mirrors
/
wmii
mirror of https://github.com/0intro/wmii
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix build on gmake 3.82. Closes issue #216.

This commit is contained in:
Kris Maglione 2010-08-29 08:53:15 -04:00
parent 675f117026
commit 83e5716fc8
3 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
mk/hdr.mk
View File

@ -22,11 +22,6 @@ FILTER = cat
EXCFLAGS = $(INCLUDES) -D_XOPEN_SOURCE=600 EXCFLAGS = $(INCLUDES) -D_XOPEN_SOURCE=600
# Try to avoid bash if possible. It slows the build considerably.
SHELL := $(shell which /bin/dash 2>/dev/null || echo /bin/sh)
SHELL != which /bin/dash 2>/dev/null || echo /bin/sh
.SHELL: name=sh path=$(SHELL)
COMPILE_FLAGS = $(EXCFLAGS) $(CFLAGS) COMPILE_FLAGS = $(EXCFLAGS) $(CFLAGS)
COMPILE = $(SHELL) $(ROOT)/util/compile "$(CC)" "$(PACKAGES)" "$(COMPILE_FLAGS)" COMPILE = $(SHELL) $(ROOT)/util/compile "$(CC)" "$(PACKAGES)" "$(COMPILE_FLAGS)"
COMPILEPIC = $(SHELL) $(ROOT)/util/compile "$(CC)" "$(PACKAGES)" "$(COMPILE_FLAGS) $(SOCFLAGS)" COMPILEPIC = $(SHELL) $(ROOT)/util/compile "$(CC)" "$(PACKAGES)" "$(COMPILE_FLAGS) $(SOCFLAGS)"
@ -43,28 +38,24 @@ CTAGS=ctags
PACKAGES = PACKAGES =
# and this:
# Try to find a sane shell. /bin/sh is a last resort, because it's # Try to find a sane shell. /bin/sh is a last resort, because it's
# usually bash on Linux, which means it's painfully slow. # usually bash on Linux, which means it's painfully slow.
BINSH := $(shell \ SHELLSEARCH = for sh in /bin/dash /bin/ksh /bin/sh; do \
if [ -x /bin/dash ]; then echo /bin/dash; \ if test -x $$sh; then echo $$sh; exit; fi; done
elif [ -x /bin/ksh ]; then echo /bin/ksh; \
else echo /bin/sh; fi) BINSH:= $(shell $(SHELLSEARCH))
BINSH != echo /bin/sh BINSH!= $(SHELLSEARCH)
SHELL := $(BINSH)
.SHELL: name=sh path=$(SHELL)
include $(ROOT)/config.mk include $(ROOT)/config.mk
sinclude $(ROOT)/config.local.mk
# I hate this. sinclude $(shell echo .)depend
MKCFGSH=if test -f $(ROOT)/config.local.mk; then echo $(ROOT)/config.local.mk; else echo /dev/null; fi
MKCFG:=$(shell $(MKCFGSH))
MKCFG!=$(MKCFGSH)
include $(MKCFG)
.SILENT: .SILENT:
.SUFFIXES: .$(SOEXT) .1 .3 .awk .build .c .clean .depend .install .man1 .man3 .o .o_pic .out .pdf .py .rc .sh .uninstall .SUFFIXES: .$(SOEXT) .1 .3 .awk .build .c .clean .depend .install .man1 .man3 .o .o_pic .out .pdf .py .rc .sh .uninstall
all: all:
MAKEFILES=.depend
.c.depend: .c.depend:
echo MKDEP $< echo MKDEP $<
$(DEBUG) eval "$(MKDEP) $(COMPILE_FLAGS)" $< | sed '1s|.*:|$(<:%.c=%.o):|' >>.depend $(DEBUG) eval "$(MKDEP) $(COMPILE_FLAGS)" $< | sed '1s|.*:|$(<:%.c=%.o):|' >>.depend

1
mk/wmii.mk
View File

@ -6,6 +6,7 @@ VERS = $$(test -n "$$WMII_HGVERSION" && echo $$WMII_HGVERSION || \
WMII_HGVERSION = $(VERS) WMII_HGVERSION = $(VERS)
WMII_HGVERSION:= $(shell echo $(VERS)) WMII_HGVERSION:= $(shell echo $(VERS))
WMII_HGVERSION!= echo $(VERS) WMII_HGVERSION!= echo $(VERS)
VERSION = $(WMII_HGVERSION) VERSION = $(WMII_HGVERSION)
COPYRIGHT = ©2010 Kris Maglione COPYRIGHT = ©2010 Kris Maglione