Move to gawk 3.1.5.

1 files changed, 17 insertions, 16 deletions

diff --git a/Makefile.am b/Makefile.am
index 2d7e285b..3a913150 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Makefile.am --- automake input file for gawk
 #
-# Copyright (C) 2000-2004 the Free Software Foundation, Inc.
+# Copyright (C) 2000-2005 the Free Software Foundation, Inc.
 #
 # This file is part of GAWK, the GNU implementation of the
 # AWK Programming Language.
@@ -18,7 +18,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 #
 
 ## process this file with automake to produce Makefile.in
@@ -44,7 +44,7 @@ EXTRA_DIST = \
 	POSIX.STD \
 	PROBLEMS \
 	README_d \
-	bisonfix.sed \
+	bisonfix.awk \
 	config.guess \
 	config.rpath  \
 	config.sub \
@@ -60,15 +60,14 @@ EXTRA_DIST = \
 	regex_internal.h \
 	regexec.c \
 	unsupported \
+	version.in \
 	vms \
 	ylwrap
 
 # The order to do things in.
-# Build in intl first in case we need the local gettext version.
-# Build explicitly  "." next in order to build gawk first, so
+# Build explicitly in "." in order to build gawk first, so
 # that `make check' without a prior `make' works.
 SUBDIRS = \
-	intl \
 	. \
 	awklib \
 	doc \
@@ -93,7 +92,9 @@ base_sources = \
 	getopt.c \
 	getopt.h \
 	getopt1.c \
+	getopt_int.h \
 	gettext.h \
+	hard-locale.h \
 	io.c \
 	mbsupport.h \
 	main.c \
@@ -106,30 +107,29 @@ base_sources = \
 	regex.c \
 	regex.h \
 	replace.c \
-	version.in \
 	version.c
 
 gawk_SOURCES = $(base_sources) eval.c profile.c
 pgawk_SOURCES = $(base_sources) eval_p.c profile_p.c
 
-# Get extra libs as needed
-LDADD = @LIBINTL@ @SOCKET_LIBS@
+# Get extra libs as needed, Automake will supply LIBINTL and SOCKET_LIBS.
+LDADD = $(LIBINTL) $(SOCKET_LIBS)
 
-# Set autoconf Makefile.in variables correctly
-datadir = @datadir@
-awkdatadir = @datadir@/awk
-libexecdir = @libexecdir@/awk
+# Directory for gawk's data files. Automake supplies datadir.
+pkgdatadir = $(datadir)/awk
 
 # stuff for compiling gawk/pgawk
-DEFPATH="\".$(PATH_SEPARATOR)$(awkdatadir)\""
+DEFPATH="\".$(PATH_SEPARATOR)$(pkgdatadir)\""
 
 DEFS= -DDEFPATH=$(DEFPATH) -DHAVE_CONFIG_H -DGAWK -DLOCALEDIR="\"$(datadir)/locale\""
 
-AM_CPPFLAGS = -Iintl
+AM_CPPFLAGS =
 
 # Get rid of core files when cleaning
 CLEANFILES = core core.*
 
+MAINTAINERCLEANFILES = version.c awkgram.c
+
 # We want hard links for install-exec-hook, below
 LN= ln
 
@@ -169,7 +169,8 @@ dist-hook:
 
 # Special rules for individual files
 awkgram.c: awkgram.y
-	$(YACC) $(AM_YFLAGS) $(YFLAGS) $< && sed -f $(srcdir)/bisonfix.sed < y.tab.c > $*.c && $(RM) y.tab.c
+	$(YACC) $(AM_YFLAGS) $(YFLAGS) $<
+	awk -f $(srcdir)/bisonfix.awk y.tab.c > $*.c && rm y.tab.c
 	if test -f y.tab.h; then \
 	if cmp -s y.tab.h $*.h; then rm -f y.tab.h; else mv y.tab.h $*.h; fi; \
 	else :; fi