From: <jw...@us...> - 2007-02-15 02:20:07
|
Update of /cvsroot/aolserver/nspostgres In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv12010 Modified Files: ChangeLog Makefile Log Message: add ability to specify location of pg_config executable, and so also specify which among many postgres installs is desired to use. Index: ChangeLog =================================================================== RCS file: /cvsroot/aolserver/nspostgres/ChangeLog,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** ChangeLog 15 Feb 2007 01:58:11 -0000 1.22 --- ChangeLog 15 Feb 2007 02:20:03 -0000 1.23 *************** *** 1,3 **** --- 1,11 ---- 2007-02-14 Jim Lynch <ji...@ja...> + * add the ability to specify the fully qualified location + of the pg_config executable by adding PG_CONFIG=/path/to/it; + now you can say "POSTGRES=PG_CONFIG PG_CONFIG=/some/where/pg_config" + and in so doing locate a particular installation of postgres, perhaps + among many on the same machine, or perhaps not locatable due to + not being found along the execution path. + + 2007-02-14 Jim Lynch <ji...@ja...> * correct a situation where the POSTGRES variable was prematurely overwritten. It specifies either where to find a postgres install, Index: Makefile =================================================================== RCS file: /cvsroot/aolserver/nspostgres/Makefile,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Makefile 15 Feb 2007 01:58:11 -0000 1.17 --- Makefile 15 Feb 2007 02:20:04 -0000 1.18 *************** *** 71,74 **** --- 71,78 ---- # Manage to find PostgreSQL components in the system, or where you specify # + ifndef PG_CONFIG + PG_CONFIG = pg_config + endif + ifeq ($(POSTGRES),LSB) PGLIB = /usr/lib *************** *** 76,81 **** else ifeq ($(POSTGRES),PG_CONFIG) ! PGLIB = $(shell pg_config --libs) ! PGINC = $(shell pg_config --includedir) else ifneq ($(POSTGRES),SEPARATELY) --- 80,85 ---- else ifeq ($(POSTGRES),PG_CONFIG) ! PGLIB = $(shell $(PG_CONFIG) --libs) ! PGINC = $(shell $(PG_CONFIG) --includedir) else ifneq ($(POSTGRES),SEPARATELY) |