Back out qnx plpgsql/Makefile change and move to src/Makefile.

This commit is contained in:
Bruce Momjian 2001-05-24 22:33:18 +00:00
parent f36fc7bb63
commit a1f14d30b1
3 changed files with 10 additions and 12 deletions

View File

@ -4,7 +4,7 @@
# #
# Copyright (c) 1994, Regents of the University of California # 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 = ../../.. top_builddir = ../../..
include $(top_builddir)/src/Makefile.global include $(top_builddir)/src/Makefile.global
ifneq ($(PORTNAME), qnx4)
all install installdirs uninstall distprep: all install installdirs uninstall distprep:
$(MAKE) -C src $@ $(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: clean distclean maintainer-clean:
-$(MAKE) -C src $@ -$(MAKE) -C src $@

View File

@ -2,7 +2,7 @@
# #
# Makefile for the plpgsql shared object # 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 OBJS = pl_parse.o pl_handler.o pl_comp.o pl_exec.o pl_funcs.o
ifeq ($(PORTNAME), qnx4)
all: all-lib all: all-lib
else
all:
@echo "*****"; \
echo "* PL/pgSQL was not built due to library manager problems."; \
echo "*****"
endif
# Shared library stuff # Shared library stuff
include $(top_srcdir)/src/Makefile.shlib include $(top_srcdir)/src/Makefile.shlib

View File

@ -1,2 +1,2 @@
CFLAGS= CFLAGS=-I/usr/local/include
LIBS=-lunix LIBS=-lunix