2005-02-08  Stepan Kasal  <address@hidden>

	* awklib/Makefile.am (datadir, libexecdir): Don't override the
	  default provided by Automake; change all uses instead.

diff -urpaN gawk-3.1.4.orig/awklib/Makefile.am gawk-3.1.4/awklib/Makefile.am
--- gawk-3.1.4.orig/awklib/Makefile.am	2004-07-28 15:32:55.000000000 +0200
+++ gawk-3.1.4/awklib/Makefile.am	2005-02-08 10:17:41.000000000 +0100
@@ -29,9 +29,6 @@ EXTRA_DIST = ChangeLog extract.awk eg st
 # not the source directory.
 AM_CPPFLAGS = -I..
 
-datadir = @datadir@/awk
-libexecdir = @libexecdir@/awk
-
 bin_SCRIPTS = igawk
 libexec_PROGRAMS = pwcat grcat
 AUXAWK = passwd.awk group.awk
@@ -41,15 +38,15 @@ nodist_pwcat_SOURCES = pwcat.c
 all: stamp-eg $(AUXPROGS) igawk $(AUXAWK)
 
 install-exec-hook: $(AUXAWK)
-	$(mkinstalldirs) $(DESTDIR)$(datadir)
+	$(mkinstalldirs) $(DESTDIR)$(datadir)/awk
 	for i in $(AUXAWK) $(srcdir)/eg/lib/*.awk ; do \
 		progname=`echo $$i | sed 's;.*/;;'` ; \
-		$(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/$$progname ; \
+		$(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/awk/$$progname ; \
 	done
 
 # libexecdir and datadir are removed in the top level Makefile's uninstall
 uninstall-local:
-	rm -fr $(DESTDIR)$(libexecdir)/* $(DESTDIR)$(datadir)/*
+	rm -fr $(DESTDIR)$(libexecdir)/awk $(DESTDIR)$(datadir)/awk
 	rm -f $(DESTDIR)$(bindir)/igawk
 
 clean-local:
@@ -71,9 +68,7 @@ igawk: $(srcdir)/eg/prog/igawk.sh
 	cp $(srcdir)/eg/prog/igawk.sh $@ ; chmod 755 $@
 
 passwd.awk: $(srcdir)/eg/lib/passwdawk.in
-	(cd $(srcdir)/eg/lib ; \
-	sed 's;/usr/local/libexec/awk;$(libexecdir);' < passwdawk.in) > passwd.awk
+	sed 's;/usr/local/libexec/awk;$(libexecdir)/awk;' < $(srcdir)/eg/lib/passwdawk.in > $@
 
 group.awk: $(srcdir)/eg/lib/groupawk.in
-	(cd $(srcdir)/eg/lib ; \
-	sed 's;/usr/local/libexec/awk;$(libexecdir);' < groupawk.in) > group.awk
+	sed 's;/usr/local/libexec/awk;$(libexecdir)/awk;' < $(srcdir)/eg/lib/groupawk.in > $@