libexecdir/datadir used incorrectly

[Alfred M. Szmidt]

[I'm not subscribed to bug-gawk, so please CC]

libexecdir/datadir are used incorrectly.  I haven't check for any
other references to datadir/libexecdir in gawk.  Anyway, here is a
patch to make gawk GCS conforming.

`datadir'
...
     The default definition of `datadir' should be `$(datarootdir)'.
     (If you are using Autoconf, write it as address@hidden@'.)

(the same applies for libexecdir)


A nice thing might be to install libexec programs into
$(libexecdir)/gawk/MACHINE-TRIPPLE/VERSION/
(e.g. /libexec/gawk/i686-pc-gnu0.3/3.1.3/), like many other GNU
programs do (gcc and emacs come from the top of my head).

Happy hacking.

2005-02-05  Alfred M. Szmidt  <address@hidden>

        * Makefile.am (datadir, libexecdir): Conform to the GCS, all
        references updated accordingly.

diff -up /home/ams/gsc/text/gawk/gawk-3.1.3/awklib/Makefile.am 
/tmp/buffer-content-4797R5Q
--- /home/ams/gsc/text/gawk/gawk-3.1.3/awklib/Makefile.am       2003-02-04 
13:08:16.000000000 +0100
+++ /tmp/buffer-content-4797R5Q 2005-02-05 19:20:01.000000000 +0100
@@ -29,8 +29,8 @@ EXTRA_DIST = ChangeLog extract.awk eg st
 # not the source directory.
 INCLUDES = -I..
 
-datadir = @datadir@/awk
-libexecdir = @libexecdir@/awk
+datadir = @datadir@
+libexecdir = @libexecdir@
 
 bin_SCRIPTS = igawk
 libexec_PROGRAMS = pwcat grcat
@@ -41,15 +41,15 @@ nodist_pwcat_SOURCES = pwcat.c
 all: stamp-eg $(AUXPROGS) igawk $(AUXAWK)
 
 install-exec-hook: $(AUXAWK)
-       $(mkinstalldirs) $(DESTDIR)$(datadir)
+       $(mkinstalldirs) $(DESTDIR)$(datadir)/gawk
        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)/gawk/$$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)/gawk $(DESTDIR)$(datadir)/gawk
        rm -f $(DESTDIR)$(bindir)/igawk
 
 clean-local:

Diff finished.  Sat Feb  5 19:20:03 2005