Index: src/bin/initdb/Makefile
===================================================================
RCS file: /cvsroot/pgsql-server/src/bin/initdb/Makefile,v
retrieving revision 1.29
diff -c -c -r1.29 Makefile
*** src/bin/initdb/Makefile	7 Sep 2003 03:36:03 -0000	1.29
--- src/bin/initdb/Makefile	8 Nov 2003 04:57:44 -0000
***************
*** 13,37 ****
  top_builddir = ../../..
  include $(top_builddir)/src/Makefile.global
  
! all: initdb
  
! initdb: initdb.sh $(top_builddir)/src/Makefile.global
! 	sed -e 's/@VERSION@/$(VERSION)/g' \
! 	    -e 's,@SHELL@,$(SHELL),g' \
! 	    -e 's,@HAVE_IPV6@,$(HAVE_IPV6),g' \
! 	    -e 's,@bindir@,$(bindir),g' \
! 	    -e 's,@datadir@,$(datadir),g' \
! 	  $< >$@
! 	chmod a+x $@
  
  install: all installdirs
! 	$(INSTALL_SCRIPT) initdb $(DESTDIR)$(bindir)/initdb
  
  installdirs:
  	$(mkinstalldirs) $(DESTDIR)$(bindir)
  
  uninstall:
! 	rm -f $(DESTDIR)$(bindir)/initdb
  
! clean distclean maintainer-clean:
! 	rm -f initdb
--- 13,42 ----
  top_builddir = ../../..
  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
! 
! 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)
! 	$(INSTALL_DATA) $(srcdir)/system_views.sql $(DESTDIR)$(datadir)/system_views.sql
  
  installdirs:
  	$(mkinstalldirs) $(DESTDIR)$(bindir)
  
  uninstall:
! 	rm -f $(DESTDIR)$(bindir)/initdb$(X) $(DESTDIR)$(datadir)/system_views.sql
  
! clean distclean:
! 	rm -f initdb$(X) $(OBJS)