clean up the bin/*/Makefiles...up version.h to v6.1 instead of v6.0

Remove bin/Makefile.global since it wasn't actually *doing* anything
that Makefile.global hadn't already done

diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 8a89f0710d96a6f5f4961451d4272976b2dae87a..ce45262df875b45082f6b100915bc9eb37c83d65 100644 (file)
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.22 1997/04/15 18:36:45 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.23 1997/04/26 05:04:13 scrappy Exp $
 #
 # NOTES
 #    Essentially all Postgres make files include this file and use the 
@@ -232,7 +232,7 @@ YFLAGS= @YFLAGS@
 YACC= @YACC@
 LEX= @LEX@
 AROPT= @AROPT@
-CFLAGS= @CPPFLAGS@ @CFLAGS@
+CFLAGS= -I$(SRCDIR)/include @CPPFLAGS@ @CFLAGS@ 
 CFLAGS_SL= @SHARED_LIB@
 LDFLAGS= @LDFLAGS@ @LIBS@
 DLSUFFIX= @DLSUFFIX@

diff --git a/src/bin/Makefile b/src/bin/Makefile
index 17064b6edfac51405caa532c4f96bd218fb279b8..a37cadee56868f768668c67bd0242b11128f976f 100644 (file)
--- a/src/bin/Makefile
+++ b/src/bin/Makefile
@@ -7,12 +7,11 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.6 1996/11/13 10:35:20 bryanh Exp $
+#    $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.7 1997/04/26 05:04:21 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR=..
-include ../Makefile.global
+#include ../Makefile.global
 
 .DEFAULT all:
 #

diff --git a/src/bin/Makefile.global b/src/bin/Makefile.global
deleted file mode 100644 (file)
index 2eba103..0000000
--- a/src/bin/Makefile.global
+++ /dev/null
@@ -1,31 +0,0 @@
-#-------------------------------------------------------------------------
-#
-# Makefile.inc--
-#    global configurations for Makefiles in src/bin
-#
-# Copyright (c) 1994, Regents of the University of California
-#
-#
-# IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/Attic/Makefile.global,v 1.15 1997/04/24 14:30:09 scrappy Exp $
-#
-#-------------------------------------------------------------------------
-
-SRCDIR=..
-LIBPQDIR:= $(SRCDIR)/libpq
-
-#
-# And where libpq goes, so goes the authentication stuff...
-#
-ifdef KRBVERS
-LDFLAGS+= $(KRBLIBS)
-CFLAGS+= $(KRBFLAGS)
-endif
-
-
-INCLUDE_OPT := \
-               -I$(LIBPQDIR) \
-               -I$(SRCDIR)/include 
-
-CFLAGS += $(INCLUDE_OPT) 
-

diff --git a/src/bin/pg_dump/Makefile.in b/src/bin/pg_dump/Makefile.in
index a8829df009ae6850e98a8306b9843e0134986f4e..20cf9f4def701672c0c0f1715043445f6ee2004f 100644 (file)
--- a/src/bin/pg_dump/Makefile.in
+++ b/src/bin/pg_dump/Makefile.in
@@ -7,13 +7,12 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/Makefile.in,v 1.2 1997/04/04 10:41:17 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/Makefile.in,v 1.3 1997/04/26 05:04:55 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
 SRCDIR= ../..
 include ../../Makefile.global
-include ../Makefile.global
 
 OBJS= pg_dump.o common.o @STRDUP@
 

diff --git a/src/bin/pg_id/Makefile b/src/bin/pg_id/Makefile
index 85ac6d0d6a53f64da0064ab288184b18b2937ef9..42c6fbc753c76dd775a57d2b8e877b086e7e11c9 100644 (file)
--- a/src/bin/pg_id/Makefile
+++ b/src/bin/pg_id/Makefile
@@ -7,13 +7,12 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/pg_id/Attic/Makefile,v 1.5 1997/04/04 10:41:26 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/bin/pg_id/Attic/Makefile,v 1.6 1997/04/26 05:05:20 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
 SRCDIR= ../..
 include ../../Makefile.global
-include ../Makefile.global
 
 OBJS= pg_id.o
 

diff --git a/src/bin/pg_version/Makefile b/src/bin/pg_version/Makefile
index ddfeef07fdbf67da685b71dfb5c462f58efac15c..26da635b4d795a63bd71f68e2be876d3e8bf1087 100644 (file)
--- a/src/bin/pg_version/Makefile
+++ b/src/bin/pg_version/Makefile
@@ -7,16 +7,17 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/pg_version/Attic/Makefile,v 1.4 1997/04/04 10:41:37 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/bin/pg_version/Attic/Makefile,v 1.5 1997/04/26 05:05:43 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
 SRCDIR= ../..
 include ../../Makefile.global
-include ../Makefile.global
 
 OBJS= pg_version.o ../../utils/version.o
 
+CFLAGS+= -I$(SRCDIR)/include
+
 all: pg_version
 
 pg_version: submake $(OBJS)

diff --git a/src/bin/pgtclsh/Makefile b/src/bin/pgtclsh/Makefile
index 68c9eb742d0c4947a2ec8c5ca54aa92b1ebd5222..3a6919b5dd734e5b1eda7d6c079fa10758f383dc 100644 (file)
--- a/src/bin/pgtclsh/Makefile
+++ b/src/bin/pgtclsh/Makefile
@@ -7,13 +7,12 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.6 1997/04/04 10:42:11 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.7 1997/04/26 05:06:12 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
 SRCDIR= ../..
 include ../../Makefile.global
-include ../Makefile.global
 
 CFLAGS+=  -I$(TCL_INCDIR) -I$(TK_INCDIR) -I$(X11_INCDIR) -I$(SRCDIR)/libpgtcl
 

diff --git a/src/bin/psql/Makefile.in b/src/bin/psql/Makefile.in
index 91a8322230d598376357c4cc542a6c10d1880250..ab7de496fdc0096c08c863a5f63c5bec3d10799b 100644 (file)
--- a/src/bin/psql/Makefile.in
+++ b/src/bin/psql/Makefile.in
@@ -7,17 +7,14 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/psql/Attic/Makefile.in,v 1.4 1997/04/04 10:42:23 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/bin/psql/Attic/Makefile.in,v 1.5 1997/04/26 05:06:40 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
 SRCDIR= ../..
 include ../../Makefile.global
 
-INCLUDE_OPT:= -I$(LIBPQDIR) \
-              -I../../include 
-
-CFLAGS+= $(INCLUDE_OPT)
+CFLAGS+= -I$(LIBPQDIR)
 
 OBJS= psql.o stringutils.o @STRDUP@ 
 

diff --git a/src/include/version.h b/src/include/version.h
index ecdaa860f7d127d6fb20a2cb224d8b9b41b13c53..927c11170d5bb8956abcbbaa65298a84f78a88ce 100644 (file)
--- a/src/include/version.h
+++ b/src/include/version.h
@@ -4,7 +4,7 @@
  *    this file contains the interface to version.c.
  *    Also some parameters.
  *
- * $Id: version.h,v 1.1 1996/11/11 14:24:38 bryanh Exp $
+ * $Id: version.h,v 1.2 1997/04/26 05:07:12 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,7 +18,7 @@ void
 SetPgVersion(const char *path, char **reason_p);
 
 #define        PG_RELEASE      6
-#define PG_VERSION     0
+#define PG_VERSION     1
 #define        PG_VERFILE      "PG_VERSION"
 
 #endif