Gen_fmgrtab.sh is strange: it is a platform dependent way (because it uses

CPP) to create platform independent files. Unfortunately, that means that every config.status (or configure) run invariably causes a relink of the postmaster and also that we can't put these files in the distribution (usefully). So we make it a little smarter: when the output files already exist and it notices that it would recreate them in identical form, it doesn't touch them. In order to avoid re-running the make rule all the time we update a timestamp file instead. Update release_prep accordingly. Also make Gen_fmgrtab.sh use the awk that is detected at configure time, not necessarily named `awk' and have it check for exit statuses a little better. In other news... Remove USE_LOCALE from the templates, it was set to `no' everywhere anyway. Also remove YACC and YFLAGS from the templates, configure is smart enough to find bison or yacc itself. Use AC_PROG_YACC for that instead of the hand-crafted code. Do not set YFLAGS to `-d'. The make rules that need this flag should explicitly invoke it. YFLAGS should be a user variable. Update the makefiles to that effect.
2025-07-28 23:42:10 +03:00 · 2000-06-07 16:27:00 +00:00
parent 7d301947e5
commit e3059fc0f5
48 changed files with 653 additions and 713 deletions
--- a/src/backend/bootstrap/Makefile
+++ b/src/backend/bootstrap/Makefile
@ -4,7 +4,7 @@
 #    Makefile for the bootstrap module
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.22 2000/05/29 05:44:42 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.23 2000/06/07 16:26:37 petere Exp $
 #
 #
 # We must build bootparse.c and bootscanner.c with yacc and lex and sed,
@ -48,14 +48,14 @@ SUBSYS.o: $(OBJS)
 bootstrap.o: bootstrap_tokens.h

 bootstrap_tokens.h bootparse.c: bootparse.y
-	$(YACC) $(YFLAGS) $<
+	$(YACC) -d $(YFLAGS) $<
 	grep -v "^#" boot.sed > sedfile
 	sed -f sedfile < y.tab.c > bootparse.c
 	mv y.tab.h bootstrap_tokens.h
 	rm -f y.tab.c sedfile

 bootscanner.c: bootscanner.l
-	$(LEX) $<
+	$(LEX) $(LFLAGS) $<
 	grep -v "^#" boot.sed > sedfile
 	sed -f sedfile < lex.yy.c > bootscanner.c
 	rm -f lex.yy.c sedfile
--- a/src/backend/parser/Makefile
+++ b/src/backend/parser/Makefile
@ -4,7 +4,7 @@
 #    Makefile for parser
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/parser/Makefile,v 1.25 2000/05/29 05:44:53 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/parser/Makefile,v 1.26 2000/06/07 16:26:41 petere Exp $
 #
 #-------------------------------------------------------------------------

@ -25,12 +25,12 @@ SUBSYS.o: $(OBJS)
 	$(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)

 gram.c parse.h: gram.y
-	$(YACC) $(YFLAGS) $<
+	$(YACC) -d $(YFLAGS) $<
 	mv y.tab.c gram.c
 	mv y.tab.h parse.h

 scan.c:	scan.l
-	$(LEX) $<
+	$(LEX) $(LFLAGS) $<
 	mv lex.yy.c scan.c

 # The following dependencies on parse.h are computed by
--- a/src/backend/utils/Gen_fmgrtab.sh.in
+++ b/src/backend/utils/Gen_fmgrtab.sh.in
@ -1,4 +1,4 @@
-#!/bin/sh
+#! /bin/sh
 #-------------------------------------------------------------------------
 #
 # Gen_fmgrtab.sh
@ -9,36 +9,72 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.24 2000/06/02 02:00:28 tgl Exp $
-#
-# NOTES
-#    Passes any -D options on to cpp prior to generating the list
-#    of internal functions.  These come from BKIOPTS.
+#    $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.25 2000/06/07 16:26:48 petere Exp $
 #
 #-------------------------------------------------------------------------

-BKIOPTS=''
+CMDNAME=`basename $0`
+
+AWK="@AWK@"
+CPP="@CPP@"
+
+cleanup(){
+    [ x"$noclean" != x"t" ] && rm -f "$CPPTMPFILE" "$RAWFILE" "$OIDSFILE.tmp" "$TABLEFILE.tmp"
+}
+
+BKIOPTS=
+noclean=

 #
-# Pass on any -D declarations, throwing away any other command
-# line switches.
+# Process command line switches.
 #
-for opt in $*
+while [ $# -gt 0 ]
 do
-	case $opt in
-	-D) BKIOPTS="$BKIOPTS -D$2"; shift; shift;;
-	-D*) BKIOPTS="$BKIOPTS $1"; shift;;
+    case $1 in
+	-D)
+            BKIOPTS="$BKIOPTS -D$2"
+            ;;
+	-D*)
+            BKIOPTS="$BKIOPTS $1"
+            shift;;
+        --noclean)
+            noclean=t
+            ;;
+        --help)
+            echo "$CMDNAME generates fmgroids.h and fmgrtab.c from pg_proc.h."
+            echo
+            echo "Usage:"
+            echo "  $CMDNAME [ -D define [...] ]"
+            echo
+            echo "Report bugs to <pgsql-bugs@postgresql.org>."
+            exit 0
+            ;;
 	--) shift; break;;
-	-*) shift;;
-	esac
+	-*)
+            echo "$CMDNAME: invalid option: $1"
+            exit 1
+            ;;
+        *)
+            INFILE=$1
+    esac
+    shift
 done

-INFILE=$1
-RAWFILE=fmgr.raw
+
+if [ x"$INFILE" = x ] ; then
+    echo "$CMDNAME: no input file"
+    exit 1
+fi
+
 CPPTMPFILE=fmgrtmp.c
+RAWFILE=fmgr.raw
 OIDSFILE=fmgroids.h
 TABLEFILE=fmgrtab.c

+
+trap 'echo "Caught signal." ; cleanup ; exit 1' 1 2 3 15
+
+
 #
 # Generate the file containing raw pg_proc tuple data
 # (but only for "internal" and "newinternal" language procedures...).
@ -47,7 +83,7 @@ TABLEFILE=fmgrtab.c
 # deal with preprocessor statements first (before we sort the
 # function table by oid).
 #
-awk '
+$AWK '
 BEGIN		{ raw = 0; }
 /^DATA/		{ print; next; }
 /^BKI_BEGIN/	{ raw = 1; next; }
@ -56,21 +92,34 @@ raw == 1	{ print; next; }' $INFILE | \
 sed 	-e 's/^.*OID[^=]*=[^0-9]*//' \
 	-e 's/(//g' \
 	-e 's/[ 	]*).*$//' | \
-awk '
+$AWK '
 /^#/		{ print; next; }
 $4 == "11"	{ print; next; }
 $4 == "12"	{ print; next; }' > $CPPTMPFILE

-@CPP@ $BKIOPTS $CPPTMPFILE | \
+if [ $? -ne 0 ]; then
+    cleanup
+    echo "$CMDNAME failed"
+    exit 1
+fi
+
+$CPP $BKIOPTS $CPPTMPFILE | \
 egrep '^[0-9]' | \
 sort -n > $RAWFILE

-rm -f $CPPTMPFILE
+if [ $? -ne 0 ]; then
+    cleanup
+    echo "$CMDNAME failed"
+    exit 1
+fi
+
+
+cpp_define=`echo $OIDSFILE | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ | sed -e 's/[^A-Z]/_/g'`

 #
 # Generate fmgroids.h
 #
-cat > $OIDSFILE <<FuNkYfMgRsTuFf
+cat > "${OIDSFILE}.tmp" <<FuNkYfMgRsTuFf
 /*-------------------------------------------------------------------------
 *
 * $OIDSFILE
@ -82,20 +131,18 @@ cat > $OIDSFILE <<FuNkYfMgRsTuFf
 * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
 * Portions Copyright (c) 1994, Regents of the University of California
 *
- * $Id: Gen_fmgrtab.sh.in,v 1.24 2000/06/02 02:00:28 tgl Exp $
- *
 * NOTES
 *	******************************
 *	*** DO NOT EDIT THIS FILE! ***
 *	******************************
 *
- *	It has been GENERATED by $0
+ *	It has been GENERATED by $CMDNAME
 *	from $INFILE
 *
 *-------------------------------------------------------------------------
 */
-#ifndef	FMGROIDS_H
-#define FMGROIDS_H
+#ifndef	$cpp_define
+#define $cpp_define

 /*
 *	Constant macros for the OIDs of entries in pg_proc.
@ -111,13 +158,19 @@ cat > $OIDSFILE <<FuNkYfMgRsTuFf
 FuNkYfMgRsTuFf

 tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' < $RAWFILE | \
-awk '
+$AWK '
 BEGIN	{ OFS = ""; }
-	{ if (seenit[$(NF-1)]++ == 0) print "#define F_", $(NF-1), " ", $1; }' >> $OIDSFILE
+	{ if (seenit[$(NF-1)]++ == 0) print "#define F_", $(NF-1), " ", $1; }' >> "${OIDSFILE}.tmp"

-cat >> $OIDSFILE <<FuNkYfMgRsTuFf
+if [ $? -ne 0 ]; then
+    cleanup
+    echo "$CMDNAME failed"
+    exit 1
+fi

-#endif	/* FMGROIDS_H */
+cat >> "${OIDSFILE}.tmp" <<FuNkYfMgRsTuFf
+
+#endif	/* $cpp_define */
 FuNkYfMgRsTuFf

 #
@ -129,7 +182,7 @@ FuNkYfMgRsTuFf
 # this table definition as a separate C file that won't need to include any
 # "real" declarations for those functions!
 #
-cat > $TABLEFILE <<FuNkYfMgRtAbStUfF
+cat > "${TABLEFILE}.tmp" <<FuNkYfMgRtAbStUfF
 /*-------------------------------------------------------------------------
 *
 * $TABLEFILE
@ -138,16 +191,13 @@ cat > $TABLEFILE <<FuNkYfMgRtAbStUfF
 * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
 * Portions Copyright (c) 1994, Regents of the University of California
 *
- * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.24 2000/06/02 02:00:28 tgl Exp $
- *
 * NOTES
 *
 *	******************************
 *	*** DO NOT EDIT THIS FILE! ***
 *	******************************
 *
- *	It has been GENERATED by $0
+ *	It has been GENERATED by $CMDNAME
 *	from $INFILE
 *
 *	We lie here to cc about the return type and arguments of old-style
@ -163,9 +213,16 @@ cat > $TABLEFILE <<FuNkYfMgRtAbStUfF

 FuNkYfMgRtAbStUfF

-awk '{ print "extern Datum", $(NF-1), "(PG_FUNCTION_ARGS);"; }' $RAWFILE >> $TABLEFILE
+$AWK '{ print "extern Datum", $(NF-1), "(PG_FUNCTION_ARGS);"; }' $RAWFILE >> "${TABLEFILE}.tmp"

-cat >> $TABLEFILE <<FuNkYfMgRtAbStUfF
+if [ $? -ne 0 ]; then
+    cleanup
+    echo "$CMDNAME failed"
+    exit 1
+fi
+
+
+cat >> "${TABLEFILE}.tmp" <<FuNkYfMgRtAbStUfF

 const FmgrBuiltin fmgr_builtins[] = {
 FuNkYfMgRtAbStUfF
@ -174,7 +231,7 @@ FuNkYfMgRtAbStUfF
 # may seem tedious, but avoid the temptation to write a quick x?y:z
 # conditional expression instead.  Not all awks have conditional expressions.

-awk 'BEGIN {
+$AWK 'BEGIN {
    Strict["t"] = "true"
    Strict["f"] = "false"
    OldStyle["11"] = "true"
@ -182,10 +239,18 @@ awk 'BEGIN {
 }
 { printf ("  { %d, \"%s\", %d, %s, %s, %s },\n"), \
 	$1, $(NF-1), $9, Strict[$8], OldStyle[$4], $(NF-1)
-}' $RAWFILE >> $TABLEFILE
+}' $RAWFILE >> "${TABLEFILE}.tmp"

-cat >> $TABLEFILE <<FuNkYfMgRtAbStUfF
+if [ $? -ne 0 ]; then
+    cleanup
+    echo "$CMDNAME failed"
+    exit 1
+fi
+
+cat >> "${TABLEFILE}.tmp" <<FuNkYfMgRtAbStUfF
  /* dummy entry is easier than getting rid of comma after last real one */
+  /* (not that there has ever been anything wrong with *having* a
+     comma after the last field in an array initializer) */
  { 0, NULL, 0, false, false, (PGFunction) NULL }
 };

@ -194,9 +259,22 @@ const int fmgr_nbuiltins = (sizeof(fmgr_builtins) / sizeof(FmgrBuiltin)) - 1;

 FuNkYfMgRtAbStUfF

-rm -f $RAWFILE

-# ----------------
-#	all done
-# ----------------
+
+# Now we check if the files fmgroids.h and fmgrtab.c already exist and
+# are identical to what we would make them. In that case we avoid
+# writing our new version, so as to not cause unnecessary recompilation
+# because of changed timestamps.
+
+for file in "$OIDSFILE" "$TABLEFILE" ; do
+    if test -f "$file" && cmp -s "$file" "${file}.tmp" ; then
+        echo "$file unchanged"
+        rm -f "${file}.tmp"
+    else
+        mv "${file}.tmp" "$file"
+    fi
+done
+
+
+cleanup
 exit 0
--- a/src/backend/utils/Makefile
+++ b/src/backend/utils/Makefile
@ -4,7 +4,7 @@
 #    Makefile for utils
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/Makefile,v 1.12 2000/05/29 05:45:18 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/Makefile,v 1.13 2000/06/07 16:26:48 petere Exp $
 #
 #-------------------------------------------------------------------------

@ -31,11 +31,20 @@ SUBSYS.o: $(OBJS)
 submake:
 	for i in $(DIRS); do $(MAKE) -C $$i SUBSYS.o; done

-fmgroids.h fmgrtab.c: Gen_fmgrtab.sh $(SRCDIR)/include/catalog/pg_proc.h
-	$(SHELL) $(SHOPTS) Gen_fmgrtab.sh $(SRCDIR)/include/catalog/pg_proc.h
+# Gen_fmgrtab.sh will not change the timestamp of its output files
+# if they already exist and would not be changed. This is to avoid
+# unnecessary recompilations. In order to avoid re-running it all
+# the time we update a stamp file instead. (Idea stolen from
+# autoconf and autoheader.)

+fmgroids.h fmgrtab.c: fmgrstamp-h
+fmgrstamp-h: Gen_fmgrtab.sh $(SRCDIR)/include/catalog/pg_proc.h
+	$(SHELL) $(SHOPTS) Gen_fmgrtab.sh $(SRCDIR)/include/catalog/pg_proc.h
+	echo timestamp > fmgrstamp-h
+
+# don't clean fmgroids.h and fmgrtab.c
 clean:
-	rm -f SUBSYS.o fmgroids.h fmgrtab.o fmgrtab.c
+	rm -f SUBSYS.o fmgrtab.o
 	for i in $(DIRS); do $(MAKE) -C $$i clean; done

 dep depend: fmgroids.h fmgrtab.c
--- a/src/interfaces/ecpg/preproc/Makefile.in
+++ b/src/interfaces/ecpg/preproc/Makefile.in
@ -26,12 +26,12 @@ ecpg: $(OBJS)
 	$(CC) -o ecpg $(OBJS) $(LEXLIB) $(LDFLAGS)

 preproc.c preproc.h: preproc.y
-	$(YACC) $(YFLAGS) $<
+	$(YACC) -d $(YFLAGS) $<
 	mv y.tab.c preproc.c
 	mv y.tab.h preproc.h

 pgc.c: pgc.l
-	$(LEX) $<
+	$(LEX) $(LFLAGS) $<
 	mv lex.yy.c pgc.c

 clean:
--- a/src/pl/plpgsql/src/Makefile.in
+++ b/src/pl/plpgsql/src/Makefile.in
@ -4,7 +4,7 @@
 #    Makefile for the plpgsql shared object
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/Makefile.in,v 1.24 2000/06/06 22:01:12 petere Exp $
+#    $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/Makefile.in,v 1.25 2000/06/07 16:26:54 petere Exp $
 #
 #-------------------------------------------------------------------------

@ -56,7 +56,7 @@ pl_parse.o:	pl_gram.c pl_scan.c plpgsql.h
 	$(CC) $(CFLAGS) -c -o $@ pl_gram.c

 pl_gram.c pl.tab.h:	gram.y
-	$(YACC) $(YFLAGS) $<
+	$(YACC) -d $(YFLAGS) $<
 	sed -e 's/yy/plpgsql_yy/g' -e 's/YY/PLPGSQL_YY/g' <y.tab.c >pl_gram.c
 	sed -e 's/yy/plpgsql_yy/g' -e 's/YY/PLPGSQL_YY/g' <y.tab.h >pl.tab.h
 	rm -f y.tab.c y.tab.h
--- a/src/template/aix_325
+++ b/src/template/aix_325
@ -4,8 +4,5 @@ SHARED_LIB:-e _nostart -lc
 ALL:
 SRCH_INC:
 SRCH_LIB:
-USE_LOCALE:no
 DLSUFFIX:.so
-YFLAGS:-d
-YACC:
 CC:xlc
--- a/src/template/aix_41
+++ b/src/template/aix_41
@ -4,8 +4,5 @@ SHARED_LIB:-bnoentry -lc
 ALL:
 SRCH_INC:
 SRCH_LIB:
-USE_LOCALE:no
 DLSUFFIX:.so
-YFLAGS:-d
-YACC:
 CC:xlc
--- a/src/template/aix_42
+++ b/src/template/aix_42
@ -4,8 +4,5 @@ SHARED_LIB:-lc
 ALL:
 SRCH_INC:
 SRCH_LIB:
-USE_LOCALE:no
 DLSUFFIX:.so
-YFLAGS:-d
-YACC:
 CC:xlc
--- a/src/template/aix_gcc
+++ b/src/template/aix_gcc
@ -5,8 +5,5 @@ SHARED_LIB:-lc
 ALL:
 SRCH_INC:
 SRCH_LIB:
-USE_LOCALE:no
 DLSUFFIX:.so
-YFLAGS:-d
-YACC:
 CC:gcc
--- a/src/template/alpha_cc
+++ b/src/template/alpha_cc
@ -13,7 +13,5 @@ ALL:
 SRCH_INC:
 SRCH_LIB:
 DLSUFFIX:.so
-YFLAGS:-d
-YACC:
 CCC:cxx
 CXXFLAGS:-D__alpha__ -DNOFIXADE -O4 -Olimit 2000
--- a/src/template/alpha_gcc
+++ b/src/template/alpha_gcc
@ -12,5 +12,3 @@ ALL:
 SRCH_INC:
 SRCH_LIB:
 DLSUFFIX:.so
-YFLAGS:-d
-YACC:
--- a/src/template/bsdi_2.0
+++ b/src/template/bsdi_2.0
@ -4,8 +4,5 @@ SHARED_LIB:
 ALL:
 SRCH_INC:
 SRCH_LIB:
-USE_LOCALE:no
 DLSUFFIX:.o
-YFLAGS:-d
-YACC:
 CC:gcc2
--- a/src/template/bsdi_2.1
+++ b/src/template/bsdi_2.1
@ -4,9 +4,5 @@ SHARED_LIB:
 ALL:
 SRCH_INC:
 SRCH_LIB:
-USE_LOCALE:no
 DLSUFFIX:.o
-YFLAGS:-d
-YACC:
 CC:gcc2
-
--- a/src/template/bsdi_4.0
+++ b/src/template/bsdi_4.0
@ -4,9 +4,5 @@ SHARED_LIB:-fpic
 ALL:
 SRCH_INC:
 SRCH_LIB:
-USE_LOCALE:no
 DLSUFFIX:.so
-YFLAGS:-d
-YACC:
 CC:gcc
-
--- a/src/template/bsdi_4.0_sparc
+++ b/src/template/bsdi_4.0_sparc
@ -4,8 +4,5 @@ SHARED_LIB:-fpic
 ALL:
 SRCH_INC:
 SRCH_LIB:
-USE_LOCALE:no
 DLSUFFIX:.so
-YFLAGS:-d
-YACC:
 CC:gcc
--- a/src/template/cygwin32
+++ b/src/template/cygwin32
@ -4,8 +4,5 @@ SHARED_LIB:
 ALL:
 SRCH_INC:/usr/local/include
 SRCH_LIB:/usr/local/lib
-USE_LOCALE:no
 DLSUFFIX:.dll
-YFLAGS:-d -L /sw/cygwin-b20/share/
-YACC:
 LIBS:-lcygipc
--- a/src/template/dgux
+++ b/src/template/dgux
@ -5,8 +5,4 @@ SHARED_LIB:-fpic
 ALL:
 SRCH_INC:
 SRCH_LIB:
-USE_LOCALE:no
 DLSUFFIX:.so
-YFLAGS:-d
-YACC:bison -y
-
--- a/src/template/freebsd
+++ b/src/template/freebsd
@ -3,7 +3,4 @@ SHARED_LIB:-fpic -DPIC
 CFLAGS:-O2 -m486 -pipe
 SRCH_INC:
 SRCH_LIB:
-USE_LOCALE:no
 DLSUFFIX:.so
-YFLAGS:-d
-YACC:bison -y
--- a/src/template/generic
+++ b/src/template/generic
@ -4,7 +4,4 @@ SHARED_LIB:
 ALL:
 SRCH_INC:
 SRCH_LIB:
-USE_LOCALE:no
 DLSUFFIX:.so
-YFLAGS:-d
-YACC:
--- a/src/template/hpux_cc
+++ b/src/template/hpux_cc
@ -5,8 +5,6 @@ ALL:
 SRCH_INC:
 SRCH_LIB:
 DLSUFFIX:.sl
-YFLAGS:-d
-YACC:
 CC:cc
 CPP:cc -E -Ae
 # Make aCC be first C++ compiler name tried...
--- a/src/template/hpux_gcc
+++ b/src/template/hpux_gcc
@ -6,7 +6,5 @@ SRCH_INC:
 SRCH_LIB:
 DL_LIB:/usr/lib/libdld.sl
 DLSUFFIX:.sl
-YFLAGS:-d
-YACC:
 CC:gcc
 CCC:g++
--- a/src/template/irix5
+++ b/src/template/irix5
@ -4,7 +4,4 @@ SHARED_LIB:
 ALL:
 SRCH_INC:
 SRCH_LIB:
-USE_LOCALE:no
 DLSUFFIX:.so
-YFLAGS:-d
-YACC:
--- a/src/template/linux_alpha
+++ b/src/template/linux_alpha
@ -4,7 +4,4 @@ SHARED_LIB:-fpic
 ALL:
 SRCH_INC:
 SRCH_LIB:
-USE_LOCALE:no
 DLSUFFIX:.so
-YFLAGS:-d
-YACC:bison -y
--- a/src/template/linux_arm
+++ b/src/template/linux_arm
@ -4,7 +4,4 @@ SHARED_LIB:-fpic
 ALL:
 SRCH_INC:
 SRCH_LIB:
-USE_LOCALE:no
 DLSUFFIX:.so
-YFLAGS:-d
-YACC:bison -y
--- a/src/template/linux_i386
+++ b/src/template/linux_i386
@ -4,7 +4,4 @@ SHARED_LIB:-fpic
 ALL:
 SRCH_INC:
 SRCH_LIB:
-USE_LOCALE:no
 DLSUFFIX:.so
-YFLAGS:-d
-YACC:bison -y
--- a/src/template/linux_m68k
+++ b/src/template/linux_m68k
@ -4,7 +4,4 @@ SHARED_LIB:-fpic
 ALL:
 SRCH_INC:
 SRCH_LIB:
-USE_LOCALE:no
 DLSUFFIX:.so
-YFLAGS:-d
-YACC:bison -y
--- a/src/template/linux_mips
+++ b/src/template/linux_mips
@ -4,7 +4,4 @@ SHARED_LIB:-fpic
 ALL:
 SRCH_INC:
 SRCH_LIB:
-USE_LOCALE:no
 DLSUFFIX:.so
-YFLAGS:-d
-YACC:bison -y
--- a/src/template/linux_ppc
+++ b/src/template/linux_ppc
@ -4,7 +4,4 @@ SHARED_LIB:-fpic
 ALL:
 SRCH_INC:
 SRCH_LIB:
-USE_LOCALE:no
 DLSUFFIX:.so
-YFLAGS:-d
-YACC:bison -y
--- a/src/template/linux_sparc
+++ b/src/template/linux_sparc
@ -4,7 +4,4 @@ SHARED_LIB:-fpic
 ALL:
 SRCH_INC:
 SRCH_LIB:
-USE_LOCALE:no
 DLSUFFIX:.so
-YFLAGS:-d
-YACC:bison -y
--- a/src/template/netbsd
+++ b/src/template/netbsd
@ -3,7 +3,4 @@ SHARED_LIB:-fpic -DPIC
 CFLAGS:-O2 -pipe
 SRCH_INC:
 SRCH_LIB:
-USE_LOCALE:no
 DLSUFFIX:.so
-YFLAGS:-d
-YACC:
--- a/src/template/nextstep
+++ b/src/template/nextstep
@ -4,7 +4,4 @@ SHARED_LIB:
 ALL:
 SRCH_INC:
 SRCH_LIB:
-USE_LOCALE:no
 DLSUFFIX:.o
-YFLAGS:-d
-YACC:
--- a/src/template/openbsd
+++ b/src/template/openbsd
@ -3,7 +3,4 @@ SHARED_LIB:-fpic -DPIC
 CFLAGS:-O2 -pipe
 SRCH_INC:
 SRCH_LIB:
-USE_LOCALE:no
 DLSUFFIX:.so
-YFLAGS:-d
-YACC:bison -y
--- a/src/template/qnx
+++ b/src/template/qnx
@ -5,8 +5,5 @@ SHARED_LIB:
 ALL:
 SRCH_INC:
 SRCH_LIB:
-USE_LOCALE:no
 DLSUFFIX:.so
-YFLAGS:-d
-YACC:
 CXXFLAGS:-I/usr/local/lib/gcc-lib/i386-pc-qnx4/egcs-2.91.60/include/g++
--- a/src/template/sco
+++ b/src/template/sco
@ -4,9 +4,5 @@ SHARED_LIB:-K PIC
 ALL:
 SRCH_INC:
 SRCH_LIB:
-USE_LOCALE:no
 DLSUFFIX:.so
-YFLAGS:-d
-YACC:yacc
-LEX:lex
 CC:cc -b elf
--- a/src/template/solaris_i386_cc
+++ b/src/template/solaris_i386_cc
@ -4,8 +4,5 @@ SHARED_LIB:-K PIC
 ALL:
 SRCH_INC:
 SRCH_LIB:
-USE_LOCALE:no
 DLSUFFIX:.so
-YFLAGS:-d
-YACC:
 CC:cc
--- a/src/template/solaris_i386_gcc
+++ b/src/template/solaris_i386_gcc
@ -4,7 +4,4 @@ SHARED_LIB:-fPIC
 ALL:
 SRCH_INC:
 SRCH_LIB:
-USE_LOCALE:no
 DLSUFFIX:.so
-YFLAGS:-d
-YACC:
--- a/src/template/solaris_sparc_cc
+++ b/src/template/solaris_sparc_cc
@ -4,8 +4,5 @@ SHARED_LIB:-K PIC
 ALL:
 SRCH_INC:
 SRCH_LIB:
-USE_LOCALE:no
 DLSUFFIX:.so
-YFLAGS:-d
-YACC:
 CC:cc
--- a/src/template/solaris_sparc_gcc
+++ b/src/template/solaris_sparc_gcc
@ -4,7 +4,4 @@ SHARED_LIB:-fPIC
 ALL:
 SRCH_INC:
 SRCH_LIB:
-USE_LOCALE:no
 DLSUFFIX:.so
-YFLAGS:-d
-YACC:
--- a/src/template/sunos4_cc
+++ b/src/template/sunos4_cc
@ -4,8 +4,5 @@ SHARED_LIB:-PIC
 ALL:
 SRCH_INC:
 SRCH_LIB:
-USE_LOCALE:no
 DLSUFFIX:.so
-YFLAGS:-d
-YACC:
 CC:cc
--- a/src/template/sunos4_gcc
+++ b/src/template/sunos4_gcc
@ -4,7 +4,4 @@ SHARED_LIB:-fPIC
 ALL:
 SRCH_INC:
 SRCH_LIB:
-USE_LOCALE:no
 DLSUFFIX:.so
-YFLAGS:-d
-YACC:
--- a/src/template/svr4
+++ b/src/template/svr4
@ -4,7 +4,4 @@ SHARED_LIB:
 ALL:+W0
 SRCH_INC:
 SRCH_LIB:
-USE_LOCALE:no
 DLSUFFIX:.so
-YFLAGS:-d
-YACC:bison -y
--- a/src/template/ultrix4
+++ b/src/template/ultrix4
@ -4,7 +4,4 @@ SHARED_LIB:-G 0
 ALL:
 SRCH_INC:
 SRCH_LIB:
-USE_LOCALE:no
 DLSUFFIX:.so
-YFLAGS:-d
-YACC:
--- a/src/template/univel
+++ b/src/template/univel
@ -3,9 +3,6 @@ CFLAGS:-v -O -K i486,host,inline,loop_unroll -Dsvr4
 SHARED_LIB:-K PIC
 SRCH_INC:
 SRCH_LIB:
-USE_LOCALE:no
 DLSUFFIX:.so
-YACC:yacc
-YFLAGS:-d
 CC:cc
 LIBS:-lc89 
--- a/src/template/unixware
+++ b/src/template/unixware
@ -3,7 +3,5 @@ CFLAGS:-O -K i486,host,inline,loop_unroll,alloca -Dsvr4
 SHARED_LIB:-K PIC
 SRCH_INC:/opt/include
 SRCH_LIB:/opt/lib
-USE_LOCALE:no
 DLSUFFIX:.so
 CC:cc
-YFLAGS:-d
--- a/src/tools/release_prep
+++ b/src/tools/release_prep
@ -43,6 +43,13 @@ rm -f bootstrap_tokens.h bootparse.c bootscanner.c
 $MAKE bootstrap_tokens.h bootparse.c bootscanner.c
 cd ../../..

+# Generate function manager files
+
+cd src/backend/utils
+rm -f fmgroids.h fmgrtab.c fmgrstamp-h
+$MAKE fmgroids.h fmgrtab.c
+cd ../../..
+
 # Generate configuration file scanner

 cd src/backend/utils/misc