Commita1f14d3

committed

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

1 parentf36fc7b commita1f14d3Copy full SHA for a1f14d3

File tree

+10

-12

lines changed

+10

-12

lines changed

Lines changed: 1 addition & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,25 +4,16 @@`
`4`	`4`	`#`
`5`	`5`	`# Copyright (c) 1994, Regents of the University of California`
`6`	`6`	`#`
`7`		`-# $Header: /cvsroot/pgsql/src/pl/plpgsql/Makefile,v 1.6 2001/05/2415:53:34 momjian Exp $`
	`7`	`+# $Header: /cvsroot/pgsql/src/pl/plpgsql/Makefile,v 1.7 2001/05/2422:33:18 momjian Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`11`	`11`	`subdir = src/pl/plpgsql`
`12`	`12`	`top_builddir = ../../..`
`13`	`13`	`include$(top_builddir)/src/Makefile.global`
`14`	`14`
`15`		`-ifneq ($(PORTNAME), qnx4)`
`16`		`-`
`17`	`15`	`allinstallinstalldirsuninstalldistprep:`
`18`	`16`	`$(MAKE) -C src$@`
`19`	`17`
`20`		`-else #qnx4`
`21`		`-`
`22`		`-allinstallinstalldirsuninstalldistprep:`
`23`		`-echo plpgsql not supported with QNX due to lack of shared library support`
`24`		`-`
`25`		`-endif# qnx4`
`26`		`-`
`27`	`18`	`cleandistcleanmaintainer-clean:`
`28`	`19`	`-$(MAKE) -C src$@`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`#`
`3`	`3`	`# Makefile for the plpgsql shared object`
`4`	`4`	`#`
`5`		`-# $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Makefile,v 1.13 2001/04/04 21:15:56 tgl Exp $`
	`5`	`+# $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Makefile,v 1.14 2001/05/24 22:33:18 momjian Exp $`
`6`	`6`	`#`
`7`	`7`	`#-------------------------------------------------------------------------`
`8`	`8`
`@@ -21,7 +21,14 @@ override DLLLIBS := $(BE_DLLLIBS) $(DLLLIBS)`
`21`	`21`
`22`	`22`	`OBJS = pl_parse.o pl_handler.o pl_comp.o pl_exec.o pl_funcs.o`
`23`	`23`
	`24`	`+ifeq ($(PORTNAME), qnx4)`
`24`	`25`	`all: all-lib`
	`26`	`+else`
	`27`	`+all:`
	`28`	`+ @echo "*****"; \`
	`29`	`+ echo "* PL/pgSQL was not built due to library manager problems."; \`
	`30`	`+ echo "*****"`
	`31`	`+endif`
`25`	`32`
`26`	`33`	`# Shared library stuff`
`27`	`34`	`include$(top_srcdir)/src/Makefile.shlib`

Lines changed: 1 addition & 1 deletion

Comments

(0)