Fix builds --without-topology (#1565)

git-svn-id: http://svn.osgeo.org/postgis/trunk@9140 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/configure.ac b/configure.ac
index 8c31c19068273df0cdd20fbb717cf4e4e2527e19..1f82520dfa8fcc5f1fae822f87c679a805f13c2e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1001,6 +1001,7 @@ fi dnl # }
 
 dnl Output the relevant files
 AC_OUTPUT([GNUmakefile 
+   extensions/Makefile
    extensions/postgis/Makefile 
    extensions/postgis/postgis.control 
    extensions/postgis_topology/Makefile 

diff --git a/extensions/Makefile b/extensions/Makefile
deleted file mode 100644 (file)
index 23ad113..0000000
--- a/extensions/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-all: 
-       $(MAKE) -C postgis all
-       $(MAKE) -C postgis_topology all
-
-clean distclean:
-       $(MAKE) -C postgis $@
-       $(MAKE) -C postgis_topology $@
-
-install:
-       $(MAKE) -C postgis install
-       $(MAKE) -C postgis_topology install
-
-uninstall:
-       $(MAKE) -C postgis uninstall
-       $(MAKE) -C postgis_topology uninstall
-
-check:
-       @echo "Nothing to check"
-

diff --git a/extensions/Makefile.in b/extensions/Makefile.in
new file mode 100644 (file)
index 0000000..70b8d54
--- /dev/null
+++ b/extensions/Makefile.in
@@ -0,0 +1,27 @@
+#############################################################################
+#
+# Master makefile used to build extensions
+#
+# Copyright (C) 2012 Sandro Santilli <strk@keybit.net>
+#
+# This is free software; you can redistribute and/or modify it under
+# the terms of the GNU General Public Licence. See the COPYING file.
+#
+#############################################################################
+
+SUBDIRS = postgis 
+
+ifeq (@TOPOLOGY@,topology)
+       SUBDIRS += postgis_topology
+endif
+
+all clean distclean install uninstall:
+       for DIR in $(SUBDIRS); do \
+               echo "---- Making $@ in $${DIR}"; \
+               $(MAKE) -C "$${DIR}" $@; \
+       done
+
+
+check:
+       @echo "Nothing to check"
+