--- src/backend/Makefile.orig	Tue May 30 12:39:34 2000
+++ src/backend/Makefile	Tue May 30 12:48:13 2000
@@ -222,6 +222,18 @@
 		then mkdir $(HEADERDIR)/executor; fi
 	-@if [ ! -d $(HEADERDIR)/commands ]; \
 		then mkdir $(HEADERDIR)/commands; fi
+	-@if [ ! -d $(HEADERDIR)/catalog ]; \
+		then mkdir $(HEADERDIR)/catalog; fi
+	-@if [ ! -d $(HEADERDIR)/nodes ]; \
+		then mkdir $(HEADERDIR)/nodes; fi
+	-@if [ ! -d $(HEADERDIR)/tcop ]; \
+		then mkdir $(HEADERDIR)/tcop; fi
+	-@if [ ! -d $(HEADERDIR)/parser ]; \
+		then mkdir $(HEADERDIR)/parser; fi
+	-@if [ ! -d $(HEADERDIR)/storage ]; \
+		then mkdir $(HEADERDIR)/storage; fi
+	-@if [ ! -d $(HEADERDIR)/rewrite ]; \
+		then mkdir $(HEADERDIR)/rewrite; fi
 	$(INSTALL) $(INSTLOPTS) fmgr.h \
           $(HEADERDIR)/fmgr.h
 	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/os.h \
@@ -254,6 +266,156 @@
           $(HEADERDIR)/executor/spi.h
 	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/commands/trigger.h \
           $(HEADERDIR)/commands/trigger.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/access/funcindex.h \
+	  $(HEADERDIR)/access/funcindex.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/access/heapam.h \
+	  $(HEADERDIR)/access/heapam.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/access/htup.h \
+	  $(HEADERDIR)/access/htup.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/access/relscan.h \
+	  $(HEADERDIR)/access/relscan.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/access/sdir.h \
+	  $(HEADERDIR)/access/sdir.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/access/skey.h \
+	  $(HEADERDIR)/access/skey.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/access/strat.h \
+	  $(HEADERDIR)/access/strat.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/access/transam.h \
+	  $(HEADERDIR)/access/transam.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/access/tupdesc.h \
+	  $(HEADERDIR)/access/tupdesc.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/access/tupmacs.h \
+	  $(HEADERDIR)/access/tupmacs.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/access/xact.h \
+	  $(HEADERDIR)/access/xact.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/catalog/pg_am.h \
+	  $(HEADERDIR)/catalog/pg_am.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/catalog/pg_attribute.h \
+	  $(HEADERDIR)/catalog/pg_attribute.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/catalog/pg_class.h \
+	  $(HEADERDIR)/catalog/pg_class.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/catalog/pg_language.h \
+	  $(HEADERDIR)/catalog/pg_language.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/catalog/pg_proc.h \
+	  $(HEADERDIR)/catalog/pg_proc.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/catalog/pg_type.h \
+	  $(HEADERDIR)/catalog/pg_type.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/executor/execdefs.h \
+	  $(HEADERDIR)/executor/execdefs.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/executor/execdesc.h \
+	  $(HEADERDIR)/executor/execdesc.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/executor/executor.h \
+	  $(HEADERDIR)/executor/executor.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/executor/hashjoin.h \
+	  $(HEADERDIR)/executor/hashjoin.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/executor/tuptable.h \
+	  $(HEADERDIR)/executor/tuptable.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/lib/fstack.h \
+	  $(HEADERDIR)/lib/fstack.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/nodes/execnodes.h \
+	  $(HEADERDIR)/nodes/execnodes.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/nodes/memnodes.h \
+	  $(HEADERDIR)/nodes/memnodes.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/nodes/nodes.h \
+	  $(HEADERDIR)/nodes/nodes.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/nodes/params.h \
+	  $(HEADERDIR)/nodes/params.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/nodes/parsenodes.h \
+	  $(HEADERDIR)/nodes/parsenodes.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/nodes/pg_list.h \
+	  $(HEADERDIR)/nodes/pg_list.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/nodes/plannodes.h \
+	  $(HEADERDIR)/nodes/plannodes.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/nodes/primnodes.h \
+	  $(HEADERDIR)/nodes/primnodes.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/nodes/relation.h \
+	  $(HEADERDIR)/nodes/relation.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/parser/parse_node.h \
+	  $(HEADERDIR)/parser/parse_node.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/rewrite/prs2lock.h \
+	  $(HEADERDIR)/rewrite/prs2lock.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/storage/block.h \
+	  $(HEADERDIR)/storage/block.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/storage/buffile.h \
+	  $(HEADERDIR)/storage/buffile.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/storage/buf.h \
+	  $(HEADERDIR)/storage/buf.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/storage/buf_internals.h \
+	  $(HEADERDIR)/storage/buf_internals.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/storage/bufmgr.h \
+	  $(HEADERDIR)/storage/bufmgr.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/storage/bufpage.h \
+	  $(HEADERDIR)/storage/bufpage.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/storage/fd.h \
+	  $(HEADERDIR)/storage/fd.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/storage/ipc.h \
+	  $(HEADERDIR)/storage/ipc.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/storage/item.h \
+	  $(HEADERDIR)/storage/item.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/storage/itemid.h \
+	  $(HEADERDIR)/storage/itemid.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/storage/itemptr.h \
+	  $(HEADERDIR)/storage/itemptr.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/storage/lmgr.h \
+	  $(HEADERDIR)/storage/lmgr.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/storage/lock.h \
+	  $(HEADERDIR)/storage/lock.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/storage/off.h \
+	  $(HEADERDIR)/storage/off.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/storage/page.h \
+	  $(HEADERDIR)/storage/page.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/storage/shmem.h \
+	  $(HEADERDIR)/storage/shmem.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/storage/spin.h \
+	  $(HEADERDIR)/storage/spin.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/tcop/dest.h \
+	  $(HEADERDIR)/tcop/dest.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/tcop/pquery.h \
+	  $(HEADERDIR)/tcop/pquery.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/tcop/tcopprot.h \
+	  $(HEADERDIR)/tcop/tcopprot.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/tcop/utility.h \
+	  $(HEADERDIR)/tcop/utility.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/array.h \
+	  $(HEADERDIR)/utils/array.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/builtins.h \
+	  $(HEADERDIR)/utils/builtins.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/date.h \
+	  $(HEADERDIR)/utils/date.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/datetime.h \
+	  $(HEADERDIR)/utils/datetime.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/datum.h \
+	  $(HEADERDIR)/utils/datum.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/fcache.h \
+	  $(HEADERDIR)/utils/fcache.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/hsearch.h \
+	  $(HEADERDIR)/utils/hsearch.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/inet.h \
+	  $(HEADERDIR)/utils/inet.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/int8.h \
+	  $(HEADERDIR)/utils/int8.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/lztext.h \
+	  $(HEADERDIR)/utils/lztext.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/memutils.h \
+	  $(HEADERDIR)/utils/memutils.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/nabstime.h \
+	  $(HEADERDIR)/utils/nabstime.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/numeric.h \
+	  $(HEADERDIR)/utils/numeric.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/pg_lzcompress.h \
+	  $(HEADERDIR)/utils/pg_lzcompress.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/portal.h \
+	  $(HEADERDIR)/utils/portal.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/rel.h \
+	  $(HEADERDIR)/utils/rel.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/syscache.h \
+	  $(HEADERDIR)/utils/syscache.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/timestamp.h \
+	  $(HEADERDIR)/utils/timestamp.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/tqual.h \
+	  $(HEADERDIR)/utils/tqual.h
+	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/varbit.h \
+	  $(HEADERDIR)/utils/varbit.h
 ifeq ($(PORTNAME), hpux)
 # is this still necessary?
 	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/backend/port/hpux/fixade.h \