diff --git a/makefile b/makefile
index 37989f9a..cb0b523b 100644
--- a/makefile
+++ b/makefile
@@ -1,13 +1,15 @@
-# $Id: makefile,v 1.25 1996/05/06 14:38:40 roberto Exp $
+# $Id: makefile,v 1.27 1996/08/28 20:45:48 roberto Exp roberto $
 
 #configuration
 
 # define (undefine) POPEN if your system (does not) support piped I/O
-# define (undefine) POSIX if your system is (not) POSIX compliant
-CONFIG = -DPOPEN -DPOSIX
+# define (undefine) _POSIX_SOURCE if your system is (not) POSIX compliant
+#define (undefine) NOSTRERROR if your system does NOT have function "strerror"
+# (although this is ANSI, SunOS does not comply; so, add "-DNOSTRERROR" on SunOS)
+CONFIG = -DPOPEN -D_POSIX_SOURCE
 # Compilation parameters
 CC = gcc
-CFLAGS = $(CONFIG) -I/usr/5include -Wall -Wmissing-prototypes -Wshadow -ansi -O2
+CFLAGS = $(CONFIG) -Wall -Wmissing-prototypes -Wshadow -ansi -O2 -pedantic
 
 #CC = acc
 #CFLAGS = -fast -I/usr/5include
@@ -15,6 +17,7 @@ CFLAGS = $(CONFIG) -I/usr/5include -Wall -Wmissing-prototypes -Wshadow -ansi -O2
 AR = ar
 ARFLAGS	= rvl
 
+
 # Aplication modules
 LUAOBJS = \
 	parser.o \
@@ -35,28 +38,28 @@ LIBOBJS = 	\
 	strlib.o
 
 
-lua : lua.o lua.a lualib.a
-	$(CC) $(CFLAGS) -o $@ lua.o lua.a lualib.a -lm
+lua : lua.o liblua.a liblualib.a
+	$(CC) $(CFLAGS) -o $@ lua.o -L. -llua -llualib -lm
 
-lua.a : $(LUAOBJS)
+liblua.a : $(LUAOBJS)
 	$(AR) $(ARFLAGS) $@  $?
-	ranlib lua.a
+	ranlib $@
 
-lualib.a : $(LIBOBJS)
+liblualib.a : $(LIBOBJS)
 	$(AR) $(ARFLAGS) $@  $?
 	ranlib $@
 
 liblua.so.1.0 : lua.o
 	ld -o liblua.so.1.0 $(LUAOBJS)
 
-#y.tab.c y.tab.h  : lua.stx
-#	yacc++ -d lua.stx
+y.tab.c y.tab.h  : lua.stx
+	yacc -d lua.stx
 
-#parser.c : y.tab.c
-#	sed -e 's/yy/luaY_/g' -e 's/malloc\.h/stdlib\.h/g' y.tab.c > parser.c
+parser.c : y.tab.c
+	sed -e 's/yy/luaY_/g' -e 's/malloc\.h/stdlib\.h/g' y.tab.c > parser.c
 
-#parser.h : y.tab.h
-#	sed -e 's/yy/luaY_/g' y.tab.h > parser.h
+parser.h : y.tab.h
+	sed -e 's/yy/luaY_/g' y.tab.h > parser.h
 
 clear	:
 	rcsclean
@@ -65,8 +68,11 @@ clear	:
 	co lua.h lualib.h luadebug.h
 
 
-#% : RCS/%,v
-#	co $@
+%.h : RCS/%.h,v
+	co $@
+
+%.c : RCS/%.c,v
+	co $@
 
 
 fallback.o : fallback.c mem.h fallback.h lua.h opcode.h types.h tree.h func.h \
@@ -80,7 +86,7 @@ lex.o : lex.c mem.h tree.h types.h table.h opcode.h lua.h func.h lex.h inout.h \
   luadebug.h parser.h 
 lua.o : lua.c lua.h lualib.h 
 mathlib.o : mathlib.c lualib.h lua.h 
-mem.o : mem.c mem.h lua.h table.h tree.h types.h opcode.h func.h 
+mem.o : mem.c mem.h lua.h
 opcode.o : opcode.c luadebug.h lua.h mem.h opcode.h types.h tree.h func.h hash.h \
   inout.h table.h fallback.h undump.h 
 parser.o : parser.c luadebug.h lua.h mem.h lex.h opcode.h types.h tree.h func.h \