Merge pull request #14 from n0la/master

Make LUA_VER and LUA_DIR override-able from environment

1 files changed, 17 insertions, 18 deletions

diff --git a/Makefile b/Makefile
index cdf3f67..3847bf4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,21 @@
 #this file builds lua-term \o/
 
-LUA_VER         := 5.1
-LUA_DIR         := /usr
-LUA_LIBDIR      := $(LUA_DIR)/lib/lua/$(LUA_VER)/term
-LUA_INC         := $(LUA_DIR)/include/lua$(LUA_VER)
-LUA_SHARE       := $(LUA_DIR)/share/lua/$(LUA_VER)/term
-CWARNS          := -Wall -pedantic 
-CFLAGS          := $(CWARNS) -ansi -O3 -I$(LUA_INC) -fPIC
-LIB_OPTION      := -shared
-
-SONAME          := core.so
-SONAMEV         := $(SONAME).1
-LIBRARY         := $(SONAMEV).0.1
-SRC             := core.c
-OBJ             := $(patsubst %.c, %.o, $(SRC))
-
-FILES           := term/init.lua term/cursor.lua term/colors.lua
+LUA_VER         ?= 5.1
+LUA_DIR         ?= /usr
+LUA_LIBDIR      := $(LUA_DIR)/lib/lua/$(LUA_VER)/term
+LUA_INC         := $(LUA_DIR)/include/lua$(LUA_VER)
+LUA_SHARE       := $(LUA_DIR)/share/lua/$(LUA_VER)/term
+CWARNS          := -Wall -pedantic
+CFLAGS          := $(CWARNS) -ansi -O3 -I$(LUA_INC) -fPIC
+LIB_OPTION      := -shared
+
+SONAME          := core.so
+SONAMEV         := $(SONAME).1
+LIBRARY         := $(SONAMEV).0.1
+SRC             := core.c
+OBJ             := $(patsubst %.c, %.o, $(SRC))
+
+FILES           := term/init.lua term/cursor.lua term/colors.lua
 
 all: $(LIBRARY) $(SONAMEV) $(SONAME)
 
@@ -27,7 +27,7 @@ $(SONAME):
 
 $(LIBRARY): $(OBJ)
         $(CC) $(CFLAGS) $(LIB_OPTION) -o $(LIBRARY) $(OBJ) -lc
-                
+
 install:
         mkdir -p $(LUA_LIBDIR)
         cp $(SONAME) $(LUA_LIBDIR)
@@ -36,4 +36,3 @@ install:
 
 clean:
         $(RM) $(LIBRARY) $(SONAMEV) $(SONAME) *.o
-