From a1f14d30b17a62b053c36ec51d974e94a2342e53 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Thu, 24 May 2001 22:33:18 +0000
Subject: [PATCH] Back out qnx plpgsql/Makefile change and move to
 src/Makefile.

---
 src/pl/plpgsql/Makefile     | 11 +----------
 src/pl/plpgsql/src/Makefile |  9 ++++++++-
 src/template/qnx4           |  2 +-
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/pl/plpgsql/Makefile b/src/pl/plpgsql/Makefile
index 860416dcdc..6eb85fcfe5 100644
--- a/src/pl/plpgsql/Makefile
+++ b/src/pl/plpgsql/Makefile
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/pl/plpgsql/Makefile,v 1.6 2001/05/24 15:53:34 momjian Exp $
+# $Header: /cvsroot/pgsql/src/pl/plpgsql/Makefile,v 1.7 2001/05/24 22:33:18 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -12,17 +12,8 @@ subdir = src/pl/plpgsql
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-ifneq ($(PORTNAME), qnx4)
-
 all install installdirs uninstall distprep:
 	$(MAKE) -C src $@
 
-else  #qnx4
-
-all install installdirs uninstall distprep:
-	echo plpgsql not supported with QNX due to lack of shared library support
-
-endif # qnx4
-
 clean distclean maintainer-clean:
 	-$(MAKE) -C src $@
diff --git a/src/pl/plpgsql/src/Makefile b/src/pl/plpgsql/src/Makefile
index 46d27daabc..24911ec52b 100644
--- a/src/pl/plpgsql/src/Makefile
+++ b/src/pl/plpgsql/src/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for the plpgsql shared object
 #
-# $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Makefile,v 1.13 2001/04/04 21:15:56 tgl Exp $
+# $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Makefile,v 1.14 2001/05/24 22:33:18 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -21,7 +21,14 @@ override DLLLIBS := $(BE_DLLLIBS) $(DLLLIBS)
 
 OBJS = pl_parse.o pl_handler.o pl_comp.o pl_exec.o pl_funcs.o
 
+ifeq ($(PORTNAME), qnx4)
 all: all-lib
+else
+all:
+      @echo "*****"; \
+       echo "* PL/pgSQL was not built due to library manager problems."; \
+       echo "*****"
+endif
 
 # Shared library stuff
 include $(top_srcdir)/src/Makefile.shlib
diff --git a/src/template/qnx4 b/src/template/qnx4
index 62ba3ff130..d153324b9a 100644
--- a/src/template/qnx4
+++ b/src/template/qnx4
@@ -1,2 +1,2 @@
-CFLAGS=
+CFLAGS=-I/usr/local/include
 LIBS=-lunix
-- 
2.11.0