Uniformizacao de nomes de variaveis entre as bibliotecas do Kepler.

Melhorias para reutilizacao do Makefile.

2 files changed, 10 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index 95c7da1..9d2f630 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.9 2004/11/10 14:44:01 tuler Exp $
+# $Id: Makefile,v 1.10 2005/01/18 09:36:11 tomas Exp $
 
 T= lfs
 
@@ -23,9 +23,9 @@ compat-5.1.o: $(COMPAT_DIR)/compat-5.1.c
         $(CC) -c $(CFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c
 
 install: $(LIBNAME)
-        mkdir -p $(LIB_DIR)
-        cp $(LIBNAME) $(LIB_DIR)
-        ln -f -s $(LIB_DIR)/$(LIBNAME) $(LIB_DIR)/$T$(LIB_EXT)
+        mkdir -p $(LUA_LIBDIR)
+        cp $(LIBNAME) $(LUA_LIBDIR)
+        ln -f -s $(LUA_LIBDIR)/$(LIBNAME) $(LUA_LIBDIR)/$T$(LIB_EXT)
 
 clean:
         rm -f $L $(LIBNAME) $(OBJS)
diff --git a/config b/config
index 16ed356..0fe23ad 100644
--- a/config
+++ b/config
@@ -1,8 +1,10 @@
 # Installation directories
 # System's libraries directory (where binary libraries are installed)
-LIB_DIR= /usr/local/lib
+LUA_LIBDIR= /usr/local/lib/lua/5.0
 # System's lua directory (where Lua libraries are installed)
-LUA_DIR= /usr/local/lua
+LUA_DIR= /usr/local/share/lua/5.0
+# Lua includes directory
+LUA_INC= /usr/local/include/lua5
 
 # OS dependent
 LIB_EXT= .dylib
@@ -16,8 +18,8 @@ COMPAT_DIR= .
 # On FreeBSD systems, the following line should be commented
 DLLIB= -ldl
 WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings
-INCS= -I/usr/local/include/lua5 -I$(COMPAT_DIR)
-LIBS= -L$(LIB_DIR) -llua -llualib -lm $(DLLIB)
+INCS= -I$(LUA_INC) -I$(COMPAT_DIR)
+LIBS= -L$(LUA_LIBDIR) -llua -llualib -lm $(DLLIB)
 CFLAGS= $(WARN) $(INCS)
 CC= gcc