From f9c6bc791e165cf0695e707633e022aa76b8310a Mon Sep 17 00:00:00 2001 From: William Ahern Date: Wed, 27 Feb 2013 11:43:34 -0800 Subject: -n more Makefile work --- Makefile | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c26fd2d..539d8ff 100644 --- a/Makefile +++ b/Makefile @@ -8,10 +8,23 @@ luacpath = $(libdir)/lua/5.2 LUAC = $(prefix)/bin/luac +# backwards compatibile install paths +ifneq ($(origin lua52include), undefined) +luainclude = $(lua52include) +endif + +ifneq ($(origin lua52path), undefined) +luapath = $(lua52path) +endif + +ifneq ($(origin lua52cpath), undefined) +luacpath = $(lua52cpath) +endif + + VENDOR.OS = $(shell ../mk/vendor.os) VENDOR.CC = $(shell env CC="${CC}" ../mk/vendor.cc) - CPPFLAGS = -I$(luainclude) ifeq ($(VENDOR.CC), sunpro) -- cgit v1.2.3-59-g8ed1b