2003-06-25  Stepan Kasal  <address@hidden>

	* Makefile.am (install-exec-hook): Add symlink awk->gawk only if
	  the following condition is satisfied: awk executable doesn't
	  exist or awk is a version of GNU awk.
	  (install-exec-hook, uninstall-links): Make use of $(VERSION).

diff -urpN gawk-3.1.2g.a0/Makefile.am gawk-3.1.2g.a1/Makefile.am
--- gawk-3.1.2g.a0/Makefile.am	Mon May 19 13:58:24 2003
+++ gawk-3.1.2g.a1/Makefile.am	Wed Jun 25 09:56:19 2003
@@ -133,11 +133,10 @@ LN= ln
 # Same for pgawk
 # For systems where gawk is awk, add a link to awk
 install-exec-hook:
-	(fullname=gawk-`./gawk --version | sed 1q | awk '{print $$3}'` ; \
-	cd $(DESTDIR)$(bindir); \
-	$(LN) gawk $$fullname 2>/dev/null ; \
-	$(LN) pgawk p$$fullname 2>/dev/null ; \
-	if [ ! -f awk$(EXEEXT) ]; \
+	(cd $(DESTDIR)$(bindir); \
+	$(LN) gawk$(EXEEXT) gawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \
+	$(LN) pgawk$(EXEEXT) pgawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \
+	if [ ! -x "`which awk 2>/dev/null`" -o "`awk --version 2>/dev/null|awk '{print $$1; exit}'`" = "GNU" ]; \
 	then	$(LN_S) gawk$(EXEEXT) awk$(EXEEXT); \
 	fi; exit 0)
 
@@ -145,8 +144,7 @@ install-exec-hook:
 uninstall-links:
 	(cd $(DESTDIR)$(bindir); \
 	if [ -f awk$(EXEEXT) ] && cmp awk$(EXEEXT) gawk$(EXEEXT) > /dev/null; then rm -f awk$(EXEEXT); fi ; \
-	fullname=gawk-`./gawk --version | sed 1q | ./gawk '{print $$3}'` ; \
-	rm -f $$fullname p$$fullname; exit 0)
+	rm -f gawk-$(VERSION)$(EXEEXT) pgawk-$(VERSION)$(EXEEXT); exit 0)
 
 uninstall-recursive: uninstall-links