--- ./awka/Makefile.in.orig	Thu Jun 14 15:35:31 2001
+++ ./awka/Makefile.in	Thu Jun 14 15:38:47 2001
@@ -14,17 +14,15 @@
 
 YACC = @YACC@ 
 AWK = @AWK@
+LDFLAGS = @LDFLAGS@
 
 # where to put awka
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
-BINDIR = @bindir@
-LIBDIR = @libdir@
-INCDIR = @includedir@
-# where to put the man pages
-MANDIR = @mandir@
-MANEXT = @MANEXT@
+bindir = @bindir@
+libdir = @libdir@
+includedir = @includedir@
 #######################################
 
 MAKEFILEIN = Makefile.in
@@ -40,7 +38,7 @@
 	cd ..; /bin/sh ./config.status
 
 awka : $(OBJS)
-	$(CC) $(CFLAGS) $(OBJS) -o awka
+	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o awka
 
 parse.c  : parse.y
 	@echo  expect 6 shift/reduce conflicts
@@ -51,8 +49,8 @@
 	else mv y.tab.h parse.h ; fi
 
 install :  awka
-	cp awka$(EXE) $(BINDIR)
-	chmod a+rx $(BINDIR)/awka$(EXE)
+	cp awka$(EXE) $(DESTDIR)$(bindir)
+	chmod a+rx $(DESTDIR)$(bindir)/awka$(EXE)
 
 clean :
 	rm -f *.o core awka awka$(EXE)
--- ./lib/Makefile.in.orig	Thu Jun 14 15:42:03 2001
+++ ./lib/Makefile.in	Thu Jun 14 15:44:48 2001
@@ -18,12 +18,10 @@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
-BINDIR = @bindir@
-LIBDIR = @libdir@
-INCDIR = @includedir@
+bindir = @bindir@
+libdir = @libdir@
+includedir = @includedir@
 # where to put the man pages
-MANDIR = @mandir@
-MANEXT = @MANEXT@
 SHAREDLIB = @SHARED_LIB@
 VERSION = @VERSION@
 BUILDLIB = libawka.a $(SHAREDLIB)
@@ -55,11 +53,11 @@
 	$(AWK) -f ../examples/fixhdr.awk libawka.h.in >libawka.h
 
 install :  libawka.a $(SHAREDLIB)
-	cp libawka.a $(LIBDIR)
-	if [ -f libawka.so ]; then cp libawka.so $(LIBDIR); fi
-	cp libawka.h $(INCDIR)
-	chmod a+r $(LIBDIR)/libawka.*
-	chmod a+r $(INCDIR)/libawka.h
+	cp libawka.a $(DESTDIR)$(libdir)
+	if [ -f libawka.so ]; then cp libawka.so $(DESTDIR)$(libdir); fi
+	cp libawka.h $(DESTDIR)$(includedir)
+	chmod a+r $(DESTDIR)$(libdir)/libawka.*
+	chmod a+r $(DESTDIR)$(includedir)/libawka.h
 
 clean :
 	rm -f *.o ../regexp/*.o ../regexp/.done core libawka.a libawka.so libawka.h
--- ./dfa/Makefile.in.orig	Thu Jun 14 15:39:53 2001
+++ ./dfa/Makefile.in	Thu Jun 14 15:41:51 2001
@@ -18,12 +18,10 @@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
-BINDIR = @bindir@
-LIBDIR = @libdir@
-INCDIR = @includedir@
+bindir = @bindir@
+libdir = @libdir@
+includedir = @includedir@
 # where to put the man pages
-MANDIR = @mandir@
-MANEXT = @MANEXT@
 BUILDLIB = libdfa.@BUILDLIB@
 #######################################
 
@@ -46,11 +44,11 @@
 	$(CC) -shared $(CFLAGS) $(LOBJS) -o libdfa.so
 
 install :  libdfa.a
-	cp libdfa.a $(LIBDIR)
-	if [ -f libdfa.so ]; then cp libdfa.so $(LIBDIR); fi
-	cp dfa.h $(INCDIR)
-	chmod a+r $(LIBDIR)/libdfa.*
-	chmod a+r $(INCDIR)/dfa.h
+	cp libdfa.a $(DESTDIR)$(libdir)
+	if [ -f libdfa.so ]; then cp libdfa.so $(DESTDIR)$(libdir); fi
+	cp dfa.h $(DESTDIR)$(includedir)
+	chmod a+r $(DESTDIR)$(libdir)/libdfa.*
+	chmod a+r $(DESTDIR)$(includedir)/dfa.h
 
 clean :
 	rm -f *.o core libdfa.a libdfa.so 
--- ./Makefile.in.orig	Thu Jun 14 15:25:17 2001
+++ ./Makefile.in	Thu Jun 14 15:35:12 2001
@@ -20,13 +20,11 @@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
-BINDIR = @bindir@
-LIBDIR = @libdir@
-INCDIR = @includedir@
+bindir = @bindir@
+libdir = @libdir@
+includedir = @includedir@
 # where to put the man pages
-MANEXT = @MANEXT@
-MANSRCDIR = @mandir@
-MANDIR = $(MANSRCDIR)/man$(MANEXT)
+mandir = @mandir@
 SHARED_LIB = @SHARED_LIB@
 BUILDLIB = libawka.a $(SHARED_LIB)
 #######################################
@@ -47,20 +47,17 @@
 libdfa: 
 	cd dfa; $(MAKE)
 
-AWKAMAN = $(MANDIR)/awka.$(MANEXT)
 install:  awka_exe libawka
-	if [ ! -d $(LIBDIR) ]; then mkdir -p $(LIBDIR); fi
-	if [ ! -d $(INCDIR) ]; then mkdir -p $(INCDIR); fi
-	if [ ! -d $(BINDIR) ]; then mkdir -p $(BINDIR); fi
-	if [ ! -d $(MANDIR) ]; then mkdir -p $(MANDIR); fi
-	if [ ! -d $(MANSRCDIR)/man5 ]; then mkdir -p $(MANSRCDIR)/man5; fi
+	mkdir -p $(DESTDIR)$(libdir)
+	mkdir -p $(DESTDIR)$(includedir)
+	mkdir -p $(DESTDIR)$(bindir)
+	mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5
 	cd awka; $(MAKE) install
 	cd lib; $(MAKE) install
 	cd dfa; $(MAKE) install
-	cp  doc/awka.1  $(AWKAMAN)
-	cp  doc/awka-elm.5  $(MANSRCDIR)/man5
-	cp  doc/awka-elmref.5  $(MANSRCDIR)/man5
-	chmod  0644  $(AWKAMAN)
+	cp  doc/awka.1 $(DESTDIR)$(mandir)/man1
+	cp  doc/awka-elm.5 $(DESTDIR)$(mandir)/man5
+	cp  doc/awka-elmref.5 $(DESTDIR)$(mandir)/man5
 
 clean:
 	cd awka; $(MAKE) clean