From 7424521468d5a849be17078a7d2d71a76e919e77 Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Wed, 16 Sep 2009 02:40:22 +0000 Subject: [PATCH] fixed Makefile: added SHELL, s/LUA_INCLUDE/LUAINCLUDE/, stripping spaces git-svn-id: svn://anubis/anaglym/trunk@13 99a6e188-d820-4881-8870-2d33a10e2619 --- Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 703edff..87b4c91 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,7 @@ +# fix broken ubuntu +SHELL := bash + TARGET := anaglym COBJS := $(patsubst %.c,%.o,$(wildcard *.c)) CXXOBJS := $(patsubst %.cc,%.o,$(wildcard *.cc)) @@ -8,11 +11,11 @@ CXXDEPS := $(CXXOBJS:.o=.dep) DEPS := $(CDEPS) $(CXXDEPS) LUAINCLUDE := $(shell which lua-config >/dev/null 2>&1; if [[ $$? == 0 ]]; then lua-config --include; fi) -ifeq ($(LUA_INCLUDE),) -LUA_INCLUDE := -I/usr/include/lua5.1 +ifeq ($(strip $(LUA_INCLUDE)),) +LUAINCLUDE := -I/usr/include/lua5.1 endif LUALIBS := $(shell which lua-config >/dev/null 2>&1; if [[ $$? == 0 ]]; then lua-config --libs; fi) -ifeq ($(LUALIBS),) +ifeq ($(strip $(LUALIBS)),) LUALIBS := -llua5.1 endif