Re: libexecdir/datadir used incorrectly

[Aharon Robbins]

Here is the patch I've just made.  It uses some of what Stepan did.

Thanks to everyone.

Arnold
-----------------
Tue Feb  8 18:57:08 2005   Arnold D. Robbins    <address@hidden>

        * Makefile.am (pkgdatadir, pkglibexecdir): New variables for 
compatibility
        with current GNU Coding Standards.  Fixed uses. Thanks to Stepan Kasal
        and the discussion in bug-gnu-utils.

--- ../../gawk-3.1.4/awklib/Makefile.am 2004-07-28 16:32:55.000000000 +0300
+++ Makefile.am 2005-02-08 18:56:41.370676542 +0200
@@ -29,8 +29,8 @@
 # not the source directory.
 AM_CPPFLAGS = -I..
 
-datadir = @datadir@/awk
-libexecdir = @libexecdir@/awk
+pkgdatadir = @datadir@/awk
+pkglibexecdir = @libexecdir@/awk
 
 bin_SCRIPTS = igawk
 libexec_PROGRAMS = pwcat grcat
@@ -41,15 +41,15 @@
 all: stamp-eg $(AUXPROGS) igawk $(AUXAWK)
 
 install-exec-hook: $(AUXAWK)
-       $(mkinstalldirs) $(DESTDIR)$(datadir)
+       $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
        for i in $(AUXAWK) $(srcdir)/eg/lib/*.awk ; do \
                progname=`echo $$i | sed 's;.*/;;'` ; \
-               $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/$$progname ; \
+               $(INSTALL_DATA) $$i $(DESTDIR)$(pkgdatadir)/$$progname ; \
        done
 
-# libexecdir and datadir are removed in the top level Makefile's uninstall
+# pkglibexecdir and pkgdatadir are removed in the top level Makefile's 
uninstall
 uninstall-local:
-       rm -fr $(DESTDIR)$(libexecdir)/* $(DESTDIR)$(datadir)/*
+       rm -fr $(DESTDIR)$(pkglibexecdir)/* $(DESTDIR)$(pkgdatadir)/*
        rm -f $(DESTDIR)$(bindir)/igawk
 
 clean-local:
@@ -71,9 +71,7 @@
        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;$(pkglibexecdir);' < 
$(srcdir)/eg/lib/passwdawk.in > passwd.awk
 
 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;$(pkglibexecdir);' < 
$(srcdir)/eg/lib/groupawk.in > group.awk