Move disabled message up to a higher makefile.

diff --git a/src/pl/Makefile b/src/pl/Makefile
index 50957951af849a1b768ec2e51ca52803fec18cd6..ff789fc7aaf424c841938704eb513bd325306b2a 100644 (file)
--- 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 56cae1aba010727a3833b797d9b3fb6076cc7e1c..29d2c2f28f181450932c2a656c8036a59272be09 100644 (file)
--- 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 $@ $<