problems with gawk-3.0.6's Makefiles

[Peter Breitenlohner]

Hi,

I found it very nice that you now have added 'install-strip' as make target,
but in order to use it I had to apply the enclosed patch. (Parts of the
patch are for 'DESTDIR'.) All these problems would probably go away if (and
when) you use automake!

This refers to GNU Awk 3.0.6 on a Linux (glibc 2.1) system.

regards
Peter Breitenlohner <address@hidden>

diff -ur gawk-3.0.6.orig/Makefile.in gawk-3.0.6/Makefile.in
--- gawk-3.0.6.orig/Makefile.in Sun Jun 18 14:14:08 2000
+++ gawk-3.0.6/Makefile.in      Thu Sep 28 16:33:07 2000
@@ -26,6 +26,8 @@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
+DESTDIR =
+
 CC = @CC@
 YACC = @YACC@
 
@@ -174,24 +176,30 @@
 
 alloca.o:      alloca.c
 
-install:       gawk info installdirs
-       -rm -f $(bindir)/gawk
+install:       install-here install-sub
+
+install-here:  gawk info installdirs
+       -rm -f $(DESTDIR)$(bindir)/gawk
        fullname=gawk-$(REL).`./gawk '{print $$3}' $(srcdir)/patchlevel.h` ; \
-       $(INSTALL_PROGRAM) gawk $(bindir)/$$fullname ; \
-       (cd $(bindir); $(LN) $$fullname gawk)
-       (cd $(bindir); \
+       $(INSTALL_PROGRAM) gawk $(DESTDIR)$(bindir)/$$fullname ; \
+       (cd $(DESTDIR)$(bindir); $(LN) $$fullname gawk)
+       (cd $(DESTDIR)$(bindir); \
        if [ ! -f awk ]; \
        then    $(LN_S) gawk awk; \
        fi; exit 0)
        cd doc && $(MAKE) install
+
+install-sub:
        cd awklib && $(MAKE) install
 
 installdirs: mkinstalldirs
-       $(srcdir)/mkinstalldirs $(bindir) $(datadir) \
-               $(libdir) $(infodir) $(mandir) $(libexecdir)
+       $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(datadir) \
+               $(DESTDIR)$(infodir) $(DESTDIR)$(mandir) \
+               $(DESTDIR)$(libexecdir)
 
 install-strip:
-       $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
+       $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install-here
+       cd awklib && $(MAKE) install-strip
 
 uninstall:
        (cd $(bindir); \
diff -ur gawk-3.0.6.orig/awklib/Makefile.in gawk-3.0.6/awklib/Makefile.in
--- gawk-3.0.6.orig/awklib/Makefile.in  Wed Oct  7 22:33:20 1998
+++ gawk-3.0.6/awklib/Makefile.in       Thu Sep 28 16:33:05 2000
@@ -24,6 +24,8 @@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
+DESTDIR =
+
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
@@ -72,15 +74,22 @@
        (cd $(srcdir)/eg/lib ; \
        sed 's;/usr/local/libexec/awk;$(libexecdir);' < groupawk.in) > group.awk
 
-install: igawk $(AUXPROGS) $(AUXAWK)
-       $(INSTALL_PROGRAM) igawk $(bindir)/igawk
-       for i in $(AUXPROGS) ; do \
-               $(INSTALL_PROGRAM) $$i $(libexecdir)/$$i ; \
-       done
+install: install-script install-prog
+
+install-script: igawk $(AUXAWK)
+       $(INSTALL_PROGRAM) igawk $(DESTDIR)$(bindir)/igawk
        for i in $(AUXAWK) $(srcdir)/eg/lib/*.awk ; do \
                progname=`echo $$i | sed 's;.*/;;'` ; \
-               $(INSTALL_DATA) $$i $(datadir)/$$progname ; \
+               $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/$$progname ; \
        done
+
+install-prog: $(AUXPROGS)
+       for i in $(AUXPROGS) ; do \
+               $(INSTALL_PROGRAM) $$i $(DESTDIR)$(libexecdir)/$$i ; \
+       done
+
+install-strip: install-script
+       $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install-prog
 
 # libexecdir and datadir are removed in the top level Makefile's uninstall
 uninstall:
diff -ur gawk-3.0.6.orig/doc/Makefile.in gawk-3.0.6/doc/Makefile.in
--- gawk-3.0.6.orig/doc/Makefile.in     Wed Jun  7 10:48:18 2000
+++ gawk-3.0.6/doc/Makefile.in  Thu Sep 28 16:33:10 2000
@@ -24,6 +24,8 @@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
+DESTDIR =
+
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
@@ -69,26 +71,26 @@
 
 all: $(DOCS) info
 
-install: $(mandir)/gawk$(manext) $(mandir)/igawk$(manext) $(infodir)/gawk.info
+install: $(DESTDIR)$(mandir)/gawk$(manext) $(DESTDIR)$(mandir)/igawk$(manext) 
$(DESTDIR)$(infodir)/gawk.info
 
-$(infodir)/gawk.info::
+$(DESTDIR)$(infodir)/gawk.info::
        -if test -f gawk.info; then d=.; \
        else d=$(srcdir); fi; \
-       if    [ -f $(infodir)/dir -a -f $(infodir)/gawk.info ] \
-          && cmp $$d/gawk.info $(infodir)/gawk.info > /dev/null \
-          && grep '(gawk)' $(infodir)/dir  > /dev/null; then \
+       if    [ -f $(DESTDIR)$(infodir)/dir -a -f 
$(DESTDIR)$(infodir)/gawk.info ] \
+          && cmp $$d/gawk.info $(DESTDIR)$(infodir)/gawk.info > /dev/null \
+          && grep '(gawk)' $(DESTDIR)$(infodir)/dir  > /dev/null; then \
                exit 0; \
        fi; \
-       $(INSTALL_DATA) $$d/gawk.info $(infodir)/gawk.info ; \
+       $(INSTALL_DATA) $$d/gawk.info $(DESTDIR)$(infodir)/gawk.info ; \
        if $(SHELL) -c 'install-info --version' > /dev/null 2>&1 ; \
-       then install-info --info-dir=$(infodir) gawk.info ; \
+       then install-info --info-dir=$(DESTDIR)$(infodir) 
$(DESTDIR)$(infodir)/gawk.info ; \
        else true ; fi; exit 0
 
-$(mandir)/gawk$(manext):: gawk.1
-       $(INSTALL_DATA) $(srcdir)/gawk.1 $(mandir)/gawk$(manext)
+$(DESTDIR)$(mandir)/gawk$(manext):: gawk.1
+       $(INSTALL_DATA) $(srcdir)/gawk.1 $(DESTDIR)$(mandir)/gawk$(manext)
 
-$(mandir)/igawk$(manext):: igawk.1
-       $(INSTALL_DATA) $(srcdir)/igawk.1 $(mandir)/igawk$(manext)
+$(DESTDIR)$(mandir)/igawk$(manext):: igawk.1
+       $(INSTALL_DATA) $(srcdir)/igawk.1 $(DESTDIR)$(mandir)/igawk$(manext)
 
 uninstall:
        rm -f $(mandir)/gawk$(manext) $(mandir)/igawk$(manext) 
$(infodir)/gawk.info*