diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2000-08-31 16:12:35 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2000-08-31 16:12:35 +0000 |
| commit | 424f0edcb8d73446223f1812d3ca88150e1cc953 (patch) | |
| tree | 6b0f0a9d1d9aed67873e9ff8acd2b5a6da77ac58 /src/interfaces/python | |
| parent | d4266620e1c92d0b5d76d8c583f2fbfcf5bcd7fe (diff) | |
| download | postgresql-424f0edcb8d73446223f1812d3ca88150e1cc953.tar.gz postgresql-424f0edcb8d73446223f1812d3ca88150e1cc953.zip | |
Fix relative path references so that make knowns which dependencies refer
to one another. Sort out builddir vs srcdir variable namings. Remove some
now obsoleted make variables.
Diffstat (limited to 'src/interfaces/python')
| -rw-r--r-- | src/interfaces/python/GNUmakefile | 15 | ||||
| -rw-r--r-- | src/interfaces/python/Setup.in.raw | 2 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/interfaces/python/GNUmakefile b/src/interfaces/python/GNUmakefile index 1917c75c49e..dc5fa875f9b 100644 --- a/src/interfaces/python/GNUmakefile +++ b/src/interfaces/python/GNUmakefile @@ -4,20 +4,20 @@ # # Written by Peter Eisentraut <peter_e@gmx.net> # -# $Header: /cvsroot/pgsql/src/interfaces/python/Attic/GNUmakefile,v 1.1 2000/06/28 18:30:07 petere Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/python/Attic/GNUmakefile,v 1.2 2000/08/31 16:12:01 petere Exp $ # #------------------------------------------------------------------- subdir = src/interfaces/python top_builddir = ../../.. -include ../../Makefile.global +include $(top_builddir)/src/Makefile.global all: Makefile pgmodule.c libpq-all $(MAKE) -f Makefile .PHONY: libpq-all libpq-all: - $(MAKE) -C $(top_builddir)/src/interfaces/libpq all + $(MAKE) -C $(libpq_builddir) all Makefile: Setup.in Makefile.pre.in $(MAKE) -f Makefile.pre.in boot srcdir=$(srcdir) VPATH=$(srcdir) @@ -26,10 +26,11 @@ Makefile.pre.in: $(python_extmakefile) cp $< $@ Setup.in: Setup.in.raw - sed -e "s%__LIBPQ__%${top_srcdir}/src/interfaces/libpq%g" \ - -e "s%__EXTRA_LIBS__%${LIBS}%g" \ - -e "s%__INCLUDES__%${top_srcdir}/src/include%g" \ - < $< > $@ + sed -e 's,@libpq_srcdir@,$(libpq_srcdir),g' \ + -e 's,@libpq_builddir@,$(libpq_builddir),g' \ + -e 's,@EXTRA_LIBS@,$(LIBS),g' \ + -e 's,@pg_includedir@,$(top_srcdir)/src/include,g' \ + $< > $@ install: all @echo "Installing Python module" diff --git a/src/interfaces/python/Setup.in.raw b/src/interfaces/python/Setup.in.raw index dddb5588102..9c26d73968c 100644 --- a/src/interfaces/python/Setup.in.raw +++ b/src/interfaces/python/Setup.in.raw @@ -1,3 +1,3 @@ *shared* -_pg pgmodule.c -I__LIBPQ__ -I__INCLUDES__ -L__LIBPQ__ -lpq __EXTRA_LIBS__ +_pg pgmodule.c -I@libpq_srcdir@ -I@pg_includedir@ -L@libpq_builddir@ -lpq @EXTRA_LIBS@ |