Skip to content

Commit c2ae467

Browse files
scrappyscrappy
committed
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
1 parent bcd0fae commit c2ae467

File tree

9 files changed

+14
-51
lines changed

9 files changed

+14
-51
lines changed

‎src/Makefile.global.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.22 1997/04/15 18:36:45 scrappy Exp $
10+
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.23 1997/04/26 05:04:13 scrappy Exp $
1111
#
1212
# NOTES
1313
# Essentially all Postgres make files include this file and use the
@@ -232,7 +232,7 @@ YFLAGS= @YFLAGS@
232232
YACC= @YACC@
233233
LEX= @LEX@
234234
AROPT= @AROPT@
235-
CFLAGS= @CPPFLAGS@ @CFLAGS@
235+
CFLAGS= -I$(SRCDIR)/include @CPPFLAGS@ @CFLAGS@
236236
CFLAGS_SL= @SHARED_LIB@
237237
LDFLAGS= @LDFLAGS@ @LIBS@
238238
DLSUFFIX= @DLSUFFIX@

‎src/bin/Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.6 1996/11/13 10:35:20 bryanh Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.7 1997/04/26 05:04:21 scrappy Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

14-
SRCDIR=..
15-
include ../Makefile.global
14+
#include ../Makefile.global
1615

1716
.DEFAULT all:
1817
#

‎src/bin/Makefile.global

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎src/bin/pg_dump/Makefile.in

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,12 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/Makefile.in,v 1.2 1997/04/04 10:41:17 scrappy Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/Makefile.in,v 1.3 1997/04/26 05:04:55 scrappy Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

1414
SRCDIR= ../..
1515
include ../../Makefile.global
16-
include ../Makefile.global
1716

1817
OBJS= pg_dump.o common.o @STRDUP@
1918

‎src/bin/pg_id/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,12 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/pg_id/Attic/Makefile,v 1.5 1997/04/04 10:41:26 scrappy Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/pg_id/Attic/Makefile,v 1.6 1997/04/26 05:05:20 scrappy Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

1414
SRCDIR= ../..
1515
include ../../Makefile.global
16-
include ../Makefile.global
1716

1817
OBJS= pg_id.o
1918

‎src/bin/pg_version/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,17 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/pg_version/Attic/Makefile,v 1.4 1997/04/04 10:41:37 scrappy Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/pg_version/Attic/Makefile,v 1.5 1997/04/26 05:05:43 scrappy Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

1414
SRCDIR= ../..
1515
include ../../Makefile.global
16-
include ../Makefile.global
1716

1817
OBJS= pg_version.o ../../utils/version.o
1918

19+
CFLAGS+= -I$(SRCDIR)/include
20+
2021
all: pg_version
2122

2223
pg_version: submake $(OBJS)

‎src/bin/pgtclsh/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,12 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.6 1997/04/04 10:42:11 scrappy Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.7 1997/04/26 05:06:12 scrappy Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

1414
SRCDIR= ../..
1515
include ../../Makefile.global
16-
include ../Makefile.global
1716

1817
CFLAGS+= -I$(TCL_INCDIR) -I$(TK_INCDIR) -I$(X11_INCDIR) -I$(SRCDIR)/libpgtcl
1918

‎src/bin/psql/Makefile.in

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,14 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/psql/Attic/Makefile.in,v 1.4 1997/04/04 10:42:23 scrappy Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/psql/Attic/Makefile.in,v 1.5 1997/04/26 05:06:40 scrappy Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

1414
SRCDIR= ../..
1515
include ../../Makefile.global
1616

17-
INCLUDE_OPT:= -I$(LIBPQDIR) \
18-
-I../../include
19-
20-
CFLAGS+= $(INCLUDE_OPT)
17+
CFLAGS+= -I$(LIBPQDIR)
2118

2219
OBJS= psql.o stringutils.o @STRDUP@
2320

‎src/include/version.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* this file contains the interface to version.c.
55
* Also some parameters.
66
*
7-
* $Id: version.h,v 1.1 1996/11/11 14:24:38 bryanh Exp $
7+
* $Id: version.h,v 1.2 1997/04/26 05:07:12 scrappy Exp $
88
*
99
*-------------------------------------------------------------------------
1010
*/
@@ -18,7 +18,7 @@ void
1818
SetPgVersion(const char *path, char **reason_p);
1919

2020
#define PG_RELEASE 6
21-
#define PG_VERSION 0
21+
#define PG_VERSION 1
2222
#define PG_VERFILE "PG_VERSION"
2323

2424
#endif

0 commit comments

Comments
 (0)