Move to 2.15.

1 files changed, 32 insertions, 24 deletions

diff --git a/Makefile.in b/Makefile.in
index 58eb9394..f4792dc3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -51,9 +51,9 @@ LINKSTATIC=	#-Bstatic
 WARN=		#-W -Wunused -Wimplicit -Wreturn-type -Wcomment	# for gcc only
 
 # Parser to use on grammar - any one of the following will work
-PARSER = yacc
+PARSER = bison -y
+#PARSER = yacc
 #PARSER = byacc
-#PARSER = bison -y
 
 # Set LIBS to any libraries that are machine specific
 LIBS =
@@ -76,7 +76,6 @@ LIBS =
 ##MAKE_ALLOCA_S## ALLOCA= alloca.o
 
 FLAGS=
-##MAKE_RS6000## FLAGS = -qchars=signed
 
 # VMS POSIX, VAXC V3.2
 ##MAKE_VMS-Posix## FLAGS = -UVMS -D__STDC__=0
@@ -85,6 +84,9 @@ FLAGS=
 ##MAKE_Apollo## FLAGS = -U__STDC__ -A run,sys5.3
 ##MAKE_Apollo## LIBS = -A sys,any
 
+# SGI IRIX 4.0.5 cc flags
+##MAKE_SGI## FLAGS = -cckr
+
 # Use -s -Xlinker -object flags when you are satisfied that
 # that the program compiles correctly
 ##MAKE_NeXT## FLAGS = -DGFMT_WORKAROUND #-s -Xlinker -object
@@ -93,7 +95,7 @@ CFLAGS= -DGAWK $(FLAGS) $(DEBUG) $(LINKSTATIC) $(PROFILE) $(OPTIMIZE) $(WARN)
 
 # object files
 AWKOBJS = main.o eval.o builtin.o msg.o iop.o io.o field.o array.o \
-	node.o version.o missing.o re.o getopt.o
+	node.o version.o missing.o re.o getopt.o getopt1.o
 
 ALLOBJS = $(AWKOBJS) awktab.o
 
@@ -103,7 +105,7 @@ GNUOBJS= regex.o dfa.o $(ALLOCA)
 
 # source and documentation files
 SRC =	main.c eval.c builtin.c msg.c version.c \
-	iop.c io.c field.c array.c node.c missing.c re.c getopt.c
+	iop.c io.c field.c array.c node.c missing.c re.c getopt.c getopt1.c
 
 ALLSRC= $(SRC) awktab.c
 
@@ -113,7 +115,7 @@ GNUSRC = alloca.c alloca.s dfa.c dfa.h regex.c regex.h
 
 COPIES = missing/system.c missing/tzset.c \
 	missing/memcmp.c missing/memcpy.c missing/memset.c \
-	missing/random.c missing/strcase.c missing/strchr.c \
+	missing/random.c missing/strncasecmp.c missing/strchr.c \
 	missing/strerror.c missing/strtod.c \
 	missing/strftime.c missing/strftime.3 
 
@@ -136,7 +138,7 @@ ALLFILES= $(AWKSRC) $(GNUSRC) $(COPIES) $(MISC) $(DOCS) $(ALLDOC) $(OTHERS) \
 	  $(SUPPORT)
 
 # Release of gawk.  There can be no leading or trailing white space here!
-REL=2.14
+REL=2.15
 
 # rules to build gawk
 gawk: $(ALLOBJS) $(GNUOBJS) $(REOBJS)
@@ -146,6 +148,8 @@ $(AWKOBJS) regex.o dfa.o:	awk.h dfa.h regex.h
 
 getopt.o:	getopt.h
 
+getopt1.o:	getopt.h
+
 main.o: patchlevel.h
 
 awktab.c: awk.y
@@ -161,8 +165,8 @@ config.h: config.in
 	@echo or copy config.in to config.h and edit it.; exit 1
 
 install: gawk
-	install -s gawk $(DESTDIR)$(BINDIR)
-	install -c gawk.1 $(DESTDIR)$(MANDIR)/gawk.$(MANEXT)
+	cp gawk $(DESTDIR)$(BINDIR)
+	cp gawk.1 $(DESTDIR)$(MANDIR)/gawk.$(MANEXT)
 
 # ALLOCA: uncomment this if your system (notably System V boxen)
 # does not have alloca in /lib/libc.a or /lib/libPW.a
@@ -193,7 +197,7 @@ clean:
 	       *.orig *.rej */*.orig */*.rej
 
 cleaner:	clean
-	rm -f gawk awktab.c
+	rm -f gawk awktab.c Makefile
 
 clobber: clean
 	rm -f $(ALLDOC) gawk.log
@@ -206,14 +210,14 @@ gawk.dvi: gawk.texi
 gawk.info:	gawk.texi
 	makeinfo gawk.texi
 
-gawk-test-$(REL).tar.Z::
-	-rm -f gawk-test-$(REL).tar.Z
-	tar -cf - test | compress >gawk-test-$(REL).tar.Z
+gawk-test-$(REL).tar.z::
+	-rm -f gawk-test-$(REL).tar.z
+	tar -cf - test | gzip >gawk-test-$(REL).tar.z
 
 dist:	$(AWKSRC) $(GNUSRC) $(DOCS) $(MISC) $(COPIES) $(SUPPORT) clean
 	./configure msdos
 	mv config.h pc
-	-rm -rf gawk-$(REL) gawk-$(REL).*.tar.Z
+	-rm -rf gawk-$(REL) gawk-$(REL).*.tar.z
 	-mkdir gawk-$(REL)
 	cp -p $(AWKSRC) $(GNUSRC) $(DOCS) $(MISC) gawk-$(REL)
 	-mkdir gawk-$(REL)/missing
@@ -228,25 +232,29 @@ dist:	$(AWKSRC) $(GNUSRC) $(DOCS) $(MISC) $(COPIES) $(SUPPORT) clean
 	cp -p config/* gawk-$(REL)/config
 	-mkdir gawk-$(REL)/support
 	cp -p support/* gawk-$(REL)/support
-	tar -cf - test | (cd gawk-$(REL); tar xpf - )
-	tar -cf - gawk-$(REL) | compress > gawk-$(REL).`gawk '{print $$3}' patchlevel.h`.tar.Z
+	mv test gawk-$(REL)
+	tar -cf - gawk-$(REL) | gzip > gawk-$(REL).`gawk '{print $$3}' patchlevel.h`.tar.z
+	mv gawk-$(REL)/test .
 
-gawk-doc-$(REL).tar.Z:	gawk.info gawk.dvi gawk.1
-	-rm -rf gawk-doc-$(REL) gawk-doc-$(REL).tar.Z
+gawk-doc-$(REL).tar.z:	gawk.info gawk.dvi gawk.1
+	-rm -rf gawk-doc-$(REL) gawk-doc-$(REL).tar.z
 	-mkdir gawk-doc-$(REL)
 	cp -p $(INFOFILES) gawk.dvi gawk-doc-$(REL)
 	nroff -man gawk.1 > gawk-doc-$(REL)/gawk.1.pr
-	tar -cf - gawk-doc-$(REL) | compress > gawk-doc-$(REL).tar.Z
+	tar -cf - gawk-doc-$(REL) | gzip > gawk-doc-$(REL).tar.z
 
-gawk-ps-$(REL).tar.Z:	gawk.dvi gawk.1
-	-rm -rf gawk-ps-$(REL) gawk-ps-$(REL).tar.Z
+gawk-ps-$(REL).tar.z:	gawk.dvi gawk.1
+	-rm -rf gawk-ps-$(REL) gawk-ps-$(REL).tar.z
 	-mkdir gawk-ps-$(REL)
 	dvips -o !cat gawk.dvi > gawk-ps-$(REL)/gawk.postscript
 	pstroff -man gawk.1 > gawk-ps-$(REL)/gawk.1.ps
-	tar -cf - gawk-ps-$(REL) | compress > gawk-ps-$(REL).tar.Z
+	tar -cf - gawk-ps-$(REL) | gzip > gawk-ps-$(REL).tar.z
 
-release: gawk-src-$(REL).tar.Z gawk-doc-$(REL).tar.Z gawk-ps-$(REL).tar.Z \
-	 gawk-test-$(REL).tar.Z
+release: gawk-src-$(REL).tar.z gawk-doc-$(REL).tar.z gawk-ps-$(REL).tar.z \
+	 gawk-test-$(REL).tar.z
 
 test:	gawk
 	cd test; make -k
+
+check:	test
+