aboutsummaryrefslogtreecommitdiff
path: root/src/interfaces/python
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2001-05-25 15:32:33 +0000
committerBruce Momjian <bruce@momjian.us>2001-05-25 15:32:33 +0000
commit3f7c542a605ae59a457f6665cda5525a7c650978 (patch)
treef6a94de97d46d1a5168420e293f48fb56f2524c5 /src/interfaces/python
parenteeca4bdb3152a847214fb65321b846bc37a67393 (diff)
downloadpostgresql-3f7c542a605ae59a457f6665cda5525a7c650978.tar.gz
postgresql-3f7c542a605ae59a457f6665cda5525a7c650978.zip
Back out, per Peter E.
> > The attached patch changes src/interfaces/python/GNUmakefile to use the > > value of DESTDIR like the rest (or at least most) of the PostgreSQL > > makefiles. I found this problem when trying to package a pre-built > > Cygwin PostgreSQL distribution, but this problem is platform independent.
Diffstat (limited to 'src/interfaces/python')
-rw-r--r--src/interfaces/python/GNUmakefile11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/interfaces/python/GNUmakefile b/src/interfaces/python/GNUmakefile
index 7aa1cb07451..5ebe5a75cf9 100644
--- a/src/interfaces/python/GNUmakefile
+++ b/src/interfaces/python/GNUmakefile
@@ -4,7 +4,7 @@
#
# Written by Peter Eisentraut <peter_e@gmx.net>
#
-# $Header: /cvsroot/pgsql/src/interfaces/python/Attic/GNUmakefile,v 1.8 2001/05/25 14:29:39 momjian Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/python/Attic/GNUmakefile,v 1.9 2001/05/25 15:32:33 momjian Exp $
#
#-------------------------------------------------------------------
@@ -32,10 +32,10 @@ Setup.in: Setup.in.raw
-e 's%@INCLUDES@%$(filter -I%, $(CPPFLAGS))%g' \
$< > $@
-install: all installdirs
+install: all
@echo "Installing Python module"
- @if ( $(INSTALL_DATA) pg.py $(DESTDIR)$(python_moduledir) && \
- $(MAKE) -f Makefile prefix=$(DESTDIR)$(prefix) install ); then :; else \
+ @if ( $(INSTALL_DATA) pg.py $(python_moduledir) && \
+ $(MAKE) -f Makefile install ); then : ; else \
echo "*****" ;\
echo "* Skipping the installation of the Python interface module for lack"; \
echo "* of permissions. To install it, change to the directory"; \
@@ -44,9 +44,6 @@ install: all installdirs
echo "*****"; \
fi
-installdirs:
- $(mkinstalldirs) $(DESTDIR)$(python_moduledir)
-
uninstall:
@echo "*****"; \
echo "* Unfortunately, the Python interface module cannot be uninstalled"; \