From c7bfc7df0a0ff4618372980f854304bd1fa949f8 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Thu, 13 Nov 2003 20:30:37 +0000 Subject: [PATCH] Silly to copy sprompt.c from src/port when we're linking libpgport anyway. --- src/bin/initdb/Makefile | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile index 93a0193205..9920672f75 100644 --- a/src/bin/initdb/Makefile +++ b/src/bin/initdb/Makefile @@ -2,10 +2,10 @@ # # Makefile for src/bin/initdb # -# Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group +# Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/bin/initdb/Makefile,v 1.31 2003/11/11 01:58:23 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/initdb/Makefile,v 1.32 2003/11/13 20:30:37 tgl Exp $ # #------------------------------------------------------------------------- @@ -15,19 +15,13 @@ include $(top_builddir)/src/Makefile.global override CPPFLAGS := -DPGBINDIR=\"$(bindir)\" -DPGDATADIR=\"$(datadir)\" -DFRONTEND -I$(libpq_srcdir) $(CPPFLAGS) -OBJS= initdb.o sprompt.o -ifeq ($(PORTNAME), win32) -OBJS+=dirmod.o -endif +OBJS= initdb.o all: submake-libpq submake-libpgport initdb initdb: $(OBJS) $(libpq_builddir)/libpq.a $(CC) $(CFLAGS) $(OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@ -dirmod.c sprompt.c: % : $(top_srcdir)/src/port/% - rm -f $@ && $(LN_S) $< . - install: all installdirs $(INSTALL_PROGRAM) initdb$(X) $(DESTDIR)$(bindir)/initdb$(X)