summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2001-05-10 03:00:11 +0000
committerBruce Momjian <bruce@momjian.us>2001-05-10 03:00:11 +0000
commit72c8af51fd8080c9659c2b54264aa4fd78f2e151 (patch)
tree83b12b1368b33a4496bcb6e956cbf9debc95372b
parent3bcf19dc84a87f09621b60b74ea45702a8d043fb (diff)
downloadpostgresql-72c8af51fd8080c9659c2b54264aa4fd78f2e151.tar.gz
Move disabled message up to a higher makefile.
-rw-r--r--src/pl/Makefile9
-rw-r--r--src/pl/plpython/Makefile5
2 files changed, 6 insertions, 8 deletions
diff --git a/src/pl/Makefile b/src/pl/Makefile
index 50957951af..ff789fc7aa 100644
--- a/src/pl/Makefile
+++ b/src/pl/Makefile
@@ -4,7 +4,7 @@
#
# Copyright (c) 1994, Regents of the University of California
#
-# $Header: /cvsroot/pgsql/src/pl/Makefile,v 1.18 2001/05/09 19:54:38 momjian Exp $
+# $Header: /cvsroot/pgsql/src/pl/Makefile,v 1.19 2001/05/10 03:00:11 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -22,11 +22,12 @@ ifeq ($(with_perl), yes)
DIRS += plperl
endif
-ifeq ($(with_python), yes)
-DIRS += plpython
-endif
+#ifeq ($(with_python), yes)
+#DIRS += plpython
+#endif
all install installdirs uninstall depend distprep:
+ @echo "PL/Python disabled until merged into our Makefile system, bjm 2001-05-09"
@for dir in $(DIRS); do $(MAKE) -C $$dir $@ || exit; done
clean distclean maintainer-clean:
diff --git a/src/pl/plpython/Makefile b/src/pl/plpython/Makefile
index 56cae1aba0..29d2c2f28f 100644
--- a/src/pl/plpython/Makefile
+++ b/src/pl/plpython/Makefile
@@ -56,10 +56,7 @@ LDFLAGS=--shared -Wl,-E -Wl,-soname,$@
.PHONY: clean
-all:
- @echo "Disabled until merged into our Makefile system, bjm 2001-05-09"
-
-disabled: plpython.so
+all: plpython.so
plpython.o: plpython.c plpython.h
$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<