summaryrefslogtreecommitdiff
path: root/contrib/userlock
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2000-10-20 21:04:27 +0000
committerPeter Eisentraut <peter_e@gmx.net>2000-10-20 21:04:27 +0000
commit805e431a3868ac71681316927403d1ba389e113b (patch)
treee20ff81ccb4be79cbd43e87cf76f33ee5fb1887d /contrib/userlock
parent039f3f1b051b189e7ccf0c28d86d415e693ee8d6 (diff)
downloadpostgresql-805e431a3868ac71681316927403d1ba389e113b.tar.gz
Add support for VPATH builds, that is, building somewhere else than in the
source directory. This involves mostly makefiles using $(srcdir) when they might have used ".". (Regression tests don't work with this, yet.) Sort out usage of CPPFLAGS, CFLAGS (and CXXFLAGS). Add "override" keyword in most places, to preserve necessary flags even when the user overrode the flags.
Diffstat (limited to 'contrib/userlock')
-rw-r--r--contrib/userlock/Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/contrib/userlock/Makefile b/contrib/userlock/Makefile
index 7c262087c9..e33d6d9e24 100644
--- a/contrib/userlock/Makefile
+++ b/contrib/userlock/Makefile
@@ -1,15 +1,16 @@
#
-# $Header: /cvsroot/pgsql/contrib/userlock/Attic/Makefile,v 1.12 2000/07/09 13:13:52 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/userlock/Attic/Makefile,v 1.13 2000/10/20 21:03:34 petere Exp $
#
subdir = contrib/userlock
top_builddir = ../..
-include ../../src/Makefile.global
+include $(top_builddir)/src/Makefile.global
NAME := user_locks
SONAME := $(NAME)$(DLSUFFIX)
-CFLAGS += -I. $(CFLAGS_SL)
+override CPPFLAGS += -I$(srcdir)
+override CFLAGS += $(CFLAGS_SL)
all: $(SONAME) $(NAME).sql