Put headers into /include/pgsql.

3 files changed, 45 insertions, 40 deletions

diff --git a/databases/postgresql/Makefile b/databases/postgresql/Makefile
index 5e8c7510a96..3a9d7caed16 100644
--- a/databases/postgresql/Makefile
+++ b/databases/postgresql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2000/03/18 17:43:16 jlam Exp $
+# $NetBSD: Makefile,v 1.48 2000/04/09 03:53:16 jlam Exp $
 # FreeBSD Id: Makefile,v 1.22 1997/12/24 01:21:37 alex Exp
 #
 
@@ -64,8 +64,8 @@ pre-install:
 	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
 
 post-install:
-	cd ${PREFIX}; ${MV} include/libpq++.H include/libpq++.h
-	cd ${PREFIX}/include; ${RMDIR} -p port/netbsd
+	cd ${PREFIX}; ${MV} include/pgsql/libpq++.H include/pgsql/libpq++.h
+	cd ${PREFIX}/include/pgsql; ${RMDIR} -p port/netbsd
 
 .for PROG in ecpg pg_dump pg_id pg_passwd pg_version postgres psql
 	strip ${PREFIX}/bin/${PROG}
diff --git a/databases/postgresql/files/Makefile.custom b/databases/postgresql/files/Makefile.custom
index 700d0848ca1..a72e6f4454e 100644
--- a/databases/postgresql/files/Makefile.custom
+++ b/databases/postgresql/files/Makefile.custom
@@ -4,7 +4,7 @@
 # sub-Makefile in the build tree.  Makefiles for shared libraries include
 # Makefile.global then Makefile.shlib.
 #
-# $NetBSD: Makefile.custom,v 1.2 2000/03/18 17:43:16 jlam Exp $
+# $NetBSD: Makefile.custom,v 1.3 2000/04/09 03:53:17 jlam Exp $
 
 # Where the database templates are stored
 #
@@ -13,6 +13,9 @@ TEMPLATEDIR= $(POSTGRESDIR)/share/postgresql
 # installation directory for documentation
 PGDOCS=		$(POSTGRESDIR)/share/doc/postgresql
 
+# Where the header files necessary to build frontend programs get installed.
+HEADERDIR= $(POSTGRESDIR)/include/pgsql
+
 # Where the ODBC installation-wide configuration file gets installed.
 ODBCINST=	etc
 
diff --git a/databases/postgresql/pkg/PLIST b/databases/postgresql/pkg/PLIST
index a4bb9f61701..3532f703464 100644
--- a/databases/postgresql/pkg/PLIST
+++ b/databases/postgresql/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2000/03/18 17:43:18 jlam Exp $
+@comment $NetBSD: PLIST,v 1.12 2000/04/09 03:53:17 jlam Exp $
 bin/cleardbdir
 bin/createdb
 bin/createlang
@@ -20,34 +20,35 @@ bin/postgres
 bin/postmaster
 bin/psql
 bin/vacuumdb
-include/access/attnum.h
-include/c.h
-include/commands/trigger.h
-include/config.h
-include/ecpgerrno.h
-include/ecpglib.h
-include/ecpgtype.h
-include/executor/spi.h
-include/fmgr.h
-include/lib/dllist.h
-include/libpq++.h
-include/libpq++/pgconnection.h
-include/libpq++/pgcursordb.h
-include/libpq++/pgdatabase.h
-include/libpq++/pglobject.h
-include/libpq++/pgtransdb.h
-include/libpq-fe.h
-include/libpq-int.h
-include/libpq/libpq-fs.h
-include/libpq/pqcomm.h
-include/os.h
-include/postgres.h
-include/postgres_ext.h
-include/sqlca.h
-include/utils/elog.h
-include/utils/geo_decls.h
-include/utils/mcxt.h
-include/utils/palloc.h
+etc/rc.d/pgsql.sh
+include/pgsql/access/attnum.h
+include/pgsql/c.h
+include/pgsql/commands/trigger.h
+include/pgsql/config.h
+include/pgsql/ecpgerrno.h
+include/pgsql/ecpglib.h
+include/pgsql/ecpgtype.h
+include/pgsql/executor/spi.h
+include/pgsql/fmgr.h
+include/pgsql/lib/dllist.h
+include/pgsql/libpq++.h
+include/pgsql/libpq++/pgconnection.h
+include/pgsql/libpq++/pgcursordb.h
+include/pgsql/libpq++/pgdatabase.h
+include/pgsql/libpq++/pglobject.h
+include/pgsql/libpq++/pgtransdb.h
+include/pgsql/libpq-fe.h
+include/pgsql/libpq-int.h
+include/pgsql/libpq/libpq-fs.h
+include/pgsql/libpq/pqcomm.h
+include/pgsql/os.h
+include/pgsql/postgres.h
+include/pgsql/postgres_ext.h
+include/pgsql/sqlca.h
+include/pgsql/utils/elog.h
+include/pgsql/utils/geo_decls.h
+include/pgsql/utils/mcxt.h
+include/pgsql/utils/palloc.h
 lib/libecpg.a
 lib/libecpg.so.3.0
 lib/libpq++.a
@@ -929,10 +930,11 @@ share/postgresql/pg_hba.conf.sample
 @dirrm share/doc/postgresql/postgres
 @dirrm share/doc/postgresql/admin
 @dirrm share/doc/postgresql
-@dirrm include/utils
-@dirrm include/libpq
-@dirrm include/libpq++
-@dirrm include/lib
-@dirrm include/executor
-@dirrm include/commands
-@dirrm include/access
+@dirrm include/pgsql/utils
+@dirrm include/pgsql/libpq
+@dirrm include/pgsql/libpq++
+@dirrm include/pgsql/lib
+@dirrm include/pgsql/executor
+@dirrm include/pgsql/commands
+@dirrm include/pgsql/access
+@dirrm include/pgsql