From 60e42602a01b710b9489fb679405f5e21eea8704 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Thu, 13 Dec 2001 18:39:04 +0000 Subject: [PATCH] revert last change --- src/interfaces/python/GNUmakefile | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/src/interfaces/python/GNUmakefile b/src/interfaces/python/GNUmakefile index 7d11988df4..1255042403 100644 --- a/src/interfaces/python/GNUmakefile +++ b/src/interfaces/python/GNUmakefile @@ -1,4 +1,4 @@ -# $Header: /cvsroot/pgsql/src/interfaces/python/Attic/GNUmakefile,v 1.12 2001/12/03 12:39:44 darcy Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/python/Attic/GNUmakefile,v 1.13 2001/12/13 18:39:04 petere Exp $ subdir = src/interfaces/python top_builddir = ../../.. @@ -19,23 +19,10 @@ include $(top_srcdir)/src/Makefile.shlib override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS) $(python_includespec) -PY_SCRIPTS = pg.py pgdb.py -ifeq ($(with_python_compile), yes) -PY_COMPILED_SCRIPTS = $(PY_SCRIPTS:%.py=%.pyc) $(PY_SCRIPTS:%.py=%.pyo) -else -PY_COMPILED_SCRIPTS = -endif - -all: all-lib $(PY_COMPILED_SCRIPTS) +all: all-lib all-lib: libpq-all -%.pyc: %.py - $(PYTHON) -c "import py_compile; py_compile.compile(\"$<\")" - -%.pyo: %.py - $(PYTHON) -O -c "import py_compile; py_compile.compile(\"$<\")" - .PHONY: libpq-all libpq-all: $(MAKE) -C $(libpq_builddir) all @@ -51,10 +38,11 @@ install: all installdirs echo "$(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(python_moduleexecdir)/_pgmodule$(DLSUFFIX)"; \ $(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(python_moduleexecdir)/_pgmodule$(DLSUFFIX); \ \ - for i in $(PY_SCRIPTS) $(PY_COMPILED_SCRIPTS); do \ - echo $(INSTALL_DATA) $$i $(python_moduledir); \ - $(INSTALL_DATA) $$i $(python_moduledir); \ - done \ + echo "$(INSTALL_DATA) $(srcdir)/pg.py $(DESTDIR)$(python_moduledir)/pg.py"; \ + $(INSTALL_DATA) $(srcdir)/pg.py $(DESTDIR)$(python_moduledir)/pg.py; \ + \ + echo "$(INSTALL_DATA) $(srcdir)/pgdb.py $(DESTDIR)$(python_moduledir)/pgdb.py"; \ + $(INSTALL_DATA) $(srcdir)/pgdb.py $(DESTDIR)$(python_moduledir)/pgdb.py; \ else \ $(install-warning-msg); \ fi