diff options
| author | Rob Kendrick (octopus) <rjek@rjek.com> | 2012-10-02 09:36:41 +0100 |
|---|---|---|
| committer | Rob Kendrick (octopus) <rjek@rjek.com> | 2012-10-02 09:36:41 +0100 |
| commit | 9a81138648ebe48db4c5059579005f8b6c9a970d (patch) | |
| tree | 2f31f9aec40e5e886b94e20cb983ccbba1933390 | |
| parent | 75f2d86f6b3c85324309f49cbba87cc0e0be9dd0 (diff) | |
| download | luxio-9a81138648ebe48db4c5059579005f8b6c9a970d.tar.gz | |
Fix from Rob Taylor <rob.taylor@codethink.co.uk> for Fedora's lacking pkgconfig
| -rw-r--r-- | Makefile | 14 |
1 files changed, 12 insertions, 2 deletions
@@ -4,10 +4,15 @@ install: lua-5.1-try-install lua-5.2-try-install # find appropriate Lua libraries LUA51_PKG := $(shell (pkg-config --exists lua5.1 && echo lua5.1) || \ - (pkg-config --exists lua-5.1 && echo lua-5.1)) + (pkg-config --exists lua-5.1 && echo lua-5.1) || \ + (test `pkg-config --variable=V lua ` == 5.1 && echo lua)) +LUA51_HAS_MODINST := $(shell (pkg-config --print-variables lua | grep -q INSTALL_LMOD && echo YES)) ifneq ($(LUA51_PKG),) LUA51_INC := $(shell pkg-config --cflags $(LUA51_PKG)) LUA51_LIB := $(shell pkg-config --libs $(LUA51_PKG)) + ifeq ($(LUA51_HAS_MODINST),) + LOCAL := YES + endif ifeq ($(LOCAL),) LUA51_LMOD_INST := $(shell pkg-config --variable=INSTALL_LMOD $(LUA51_PKG)) LUA51_CMOD_INST := $(shell pkg-config --variable=INSTALL_CMOD $(LUA51_PKG)) @@ -25,10 +30,15 @@ lua-5.1-try-install: endif LUA52_PKG := $(shell (pkg-config --exists lua5.2 && echo lua5.2) || \ - (pkg-config --exists lua-5.2 && echo lua-5.2)) + (pkg-config --exists lua-5.2 && echo lua-5.2) || \ + (test `pkg-config --variable=V lua ` == 5.2 && echo lua)) +LUA52_HAS_MODINST := $(shell (pkg-config --print-variables lua | grep -q INSTALL_LMOD && echo YES)) ifneq ($(LUA52_PKG),) LUA52_INC := $(shell pkg-config --cflags $(LUA52_PKG)) LUA52_LIB := $(shell pkg-config --libs $(LUA52_PKG)) + ifeq ($(LUA52_HAS_MODINST),) + LOCAL := YES + endif ifeq ($(LOCAL),) LUA52_LMOD_INST := $(shell pkg-config --variable=INSTALL_LMOD $(LUA52_PKG)) LUA52_CMOD_INST := $(shell pkg-config --variable=INSTALL_CMOD $(LUA52_PKG)) |