pg_version Makefile was not being processed.

diff --git a/src/bin/pg_version/Makefile b/src/bin/pg_version/Makefile
deleted file mode 100644 (file)
index 26da635..0000000
--- a/src/bin/pg_version/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-#-------------------------------------------------------------------------
-#
-# Makefile.inc--
-#    Makefile for bin/pg_version
-#
-# Copyright (c) 1994, Regents of the University of California
-#
-#
-# IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/pg_version/Attic/Makefile,v 1.5 1997/04/26 05:05:43 scrappy Exp $
-#
-#-------------------------------------------------------------------------
-
-SRCDIR= ../..
-include ../../Makefile.global
-
-OBJS= pg_version.o ../../utils/version.o
-
-CFLAGS+= -I$(SRCDIR)/include
-
-all: pg_version
-
-pg_version: submake $(OBJS)
-       $(CC) -o pg_version $(OBJS) $(LDFLAGS)
-
-.PHONY: submake
-submake:
-       $(MAKE) -C ../../utils version.o
-
-install: pg_version
-       $(INSTALL) $(INSTL_EXE_OPTS) pg_version $(DESTDIR)$(BINDIR)/pg_version
-
-depend dep:
-       $(CC) -MM $(INCLUDE_OPT) *.c >depend
-
-clean: 
-       rm -f pg_version pg_version.o
-
-ifeq (depend,$(wildcard depend))
-include depend
-endif

diff --git a/src/configure b/src/configure
index df23eb346a5215af85605ba4b8986993c7e77d8e..8a5098b3748938121e9e60ee0723923ef15708bc 100755 (executable)
--- a/src/configure
+++ b/src/configure
@@ -4003,7 +4003,7 @@ done
 
 ac_given_srcdir=$srcdir
 
-trap 'rm -fr `echo "GNUmakefile Makefile.global backend/port/Makefile bin/psql/Makefile bin/pg_dump/Makefile backend/utils/Gen_fmgrtab.sh include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "GNUmakefile Makefile.global backend/port/Makefile bin/pg_version bin/psql/Makefile bin/pg_dump/Makefile backend/utils/Gen_fmgrtab.sh include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -4116,7 +4116,7 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"GNUmakefile Makefile.global backend/port/Makefile bin/psql/Makefile bin/pg_dump/Makefile backend/utils/Gen_fmgrtab.sh"}
+CONFIG_FILES=\${CONFIG_FILES-"GNUmakefile Makefile.global backend/port/Makefile bin/pg_version bin/psql/Makefile bin/pg_dump/Makefile backend/utils/Gen_fmgrtab.sh"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then

diff --git a/src/configure.in b/src/configure.in
index 6fef84f1d6dd0fd2dd5753ec9dc71be619d258dc..607872c123b235183523c7babf6375ad00b302d0 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -448,4 +448,4 @@ else
 fi 
 
 
-AC_OUTPUT(GNUmakefile Makefile.global backend/port/Makefile bin/psql/Makefile bin/pg_dump/Makefile backend/utils/Gen_fmgrtab.sh) 
+AC_OUTPUT(GNUmakefile Makefile.global backend/port/Makefile bin/pg_version bin/psql/Makefile bin/pg_dump/Makefile backend/utils/Gen_fmgrtab.sh)