From 3f7c542a605ae59a457f6665cda5525a7c650978 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Fri, 25 May 2001 15:32:33 +0000 Subject: [PATCH] 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. --- src/interfaces/python/GNUmakefile | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/interfaces/python/GNUmakefile b/src/interfaces/python/GNUmakefile index 7aa1cb0745..5ebe5a75cf 100644 --- a/src/interfaces/python/GNUmakefile +++ b/src/interfaces/python/GNUmakefile @@ -4,7 +4,7 @@ # # Written by Peter Eisentraut # -# $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"; \