From cfffe1873cb3f7718b89f7b8b6356940c7e175fe Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Wed, 23 Jun 2010 14:13:03 +0000 Subject: [PATCH] updated Makefile to use pkg-config for lua5.1 instead of lua-config git-svn-id: svn://anubis/anaglym/trunk@286 99a6e188-d820-4881-8870-2d33a10e2619 --- Makefile | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 13f9d0e..5efb8d9 100644 --- a/Makefile +++ b/Makefile @@ -15,14 +15,8 @@ CDEPS := $(COBJS:.o=.dep) CXXDEPS := $(CXXOBJS:.o=.dep) DEPS := $(CDEPS) $(CXXDEPS) -LUAINCLUDE := $(shell which lua-config >/dev/null 2>&1; if [ $$? -eq 0 ]; then lua-config --include; fi) -ifeq ($(strip $(LUAINCLUDE)),) -LUAINCLUDE := -I/usr/include/lua5.1 -endif -LUALIBS := $(shell which lua-config >/dev/null 2>&1; if [ $$? -eq 0 ]; then lua-config --libs; fi) -ifeq ($(strip $(LUALIBS)),) -LUALIBS := -llua5.1 -endif +LUAINCLUDE := $(shell pkg-config --cflags lua5.1) +LUALIBS := $(shell pkg-config --libs lua5.1) FTGLINCLUDE := $(shell pkg-config --cflags ftgl) FTGLLIBS := $(shell pkg-config --libs ftgl)