From 26a1956f8c7cf14c11d66ffbe8d0445cb2529d08 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Fri, 12 Sep 1997 23:24:25 +0000 Subject: [PATCH] pg_version Makefile was not being processed. --- src/bin/pg_version/Makefile | 41 ------------------------------------- src/configure | 4 ++-- src/configure.in | 2 +- 3 files changed, 3 insertions(+), 44 deletions(-) delete mode 100644 src/bin/pg_version/Makefile diff --git a/src/bin/pg_version/Makefile b/src/bin/pg_version/Makefile deleted file mode 100644 index 26da635b4d..0000000000 --- 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 df23eb346a..8a5098b374 100755 --- 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 <> $CONFIG_STATUS <> $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 6fef84f1d6..607872c123 100644 --- 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) -- 2.40.0