Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 72129e9

Browse files
author
Thomas G. Lockhart
committed
Try to configure interfaces/odbc using the --with-odbc switch.
Suppress installing man pages from here; do it from the doc/Makefile now.
1 parent b53d366 commit 72129e9

File tree

4 files changed

+273
-230
lines changed

4 files changed

+273
-230
lines changed

src/GNUmakefile.in

+1-13
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/Attic/GNUmakefile.in,v 1.29 1998/09/29 12:40:34 scrappy Exp $
10+
# $Header: /cvsroot/pgsql/src/Attic/GNUmakefile.in,v 1.30 1998/10/06 05:42:55 thomas Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -38,9 +38,6 @@ all:
3838
$(MAKE) -C interfaces all
3939
$(MAKE) -C bin all
4040
$(MAKE) -C pl all
41-
ifneq ($(wildcard man), )
42-
$(MAKE) -C man all
43-
endif
4441
@if test $@. = all. -o $@. = .; then \
4542
echo All of PostgreSQL is successfully made. Ready to install. ;\
4643
fi
@@ -51,9 +48,6 @@ install:
5148
$(MAKE) -C backend install
5249
$(MAKE) -C bin install
5350
$(MAKE) -C pl install
54-
ifneq ($(wildcard man), )
55-
$(MAKE) -C man install
56-
endif
5751
$(MAKE) -C interfaces install
5852
cat ../register.txt
5953

@@ -66,9 +60,6 @@ clean:
6660
$(MAKE) -C pl clean
6761
$(MAKE) -C test clean
6862
$(MAKE) -C ../contrib/spi clean
69-
ifneq ($(wildcard man), )
70-
$(MAKE) -C man clean
71-
endif
7263

7364
distclean: clean
7465
rm -f Makefile.global \
@@ -102,9 +93,6 @@ distclean: clean
10293
$(MAKE) -C interfaces $@
10394
$(MAKE) -C bin $@
10495
$(MAKE) -C pl $@
105-
ifneq ($(wildcard man), )
106-
$(MAKE) -C man $@
107-
endif
10896
@if test $@. = all. -o $@. = .; then \
10997
echo All of PostgreSQL is successfully made. Ready to install. ;\
11098
fi

src/Makefile.global.in

+15-1
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.45 1998/07/26 04:30:15 scrappy Exp $
10+
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.46 1998/10/06 05:42:56 thomas Exp $
1111
#
1212
# NOTES
1313
# Essentially all Postgres make files include this file and use the
@@ -80,6 +80,16 @@ POSTDOCDIR= $(POSTGRESDIR)/doc
8080
# Where the header files necessary to build frontend programs get installed.
8181
HEADERDIR= $(POSTGRESDIR)/include
8282

83+
# Where the ODBC files get installed.
84+
# This is the root for the actual locations,
85+
# to override /usr/local in the standalone version.
86+
POSTODBCDIR= $(POSTGRESDIR)
87+
88+
# Where the ODBC installation-wide configuration file gets installed.
89+
# This needs to be a client-side readable area, so can't go in $PGDATA.
90+
# - thomas 1998-10-05
91+
ODBCINST= $(POSTGRESDIR)
92+
8393
##############################################################################
8494
#
8595
# FEATURES
@@ -143,6 +153,10 @@ TK_LIB= @TK_LIB@
143153

144154
USE_PERL= @USE_PERL@
145155

156+
#
157+
# enable native odbc driver support
158+
USE_ODBC= @USE_ODBC@
159+
146160
X_CFLAGS= @X_CFLAGS@
147161
X_LIBS= @X_LIBS@
148162
X11_LIBS= -lX11 @X_EXTRA_LIBS@

0 commit comments

Comments
 (0)