From a90cece90250bd06f9aa73ad4be6396d6a8ea2d3 Mon Sep 17 00:00:00 2001
From: Marko Kreen <markokr@gmail.com>
Date: Tue, 31 Jul 2007 17:24:22 +0000
Subject: [PATCH] Install .sql files separately under $prefix/share/skytools
 for usage for python scripts, because they may be installed without
 installing postgres modules.

---
 Makefile      | 12 +++++++++++-
 config.mak.in |  2 ++
 configure.ac  | 14 +-------------
 setup.py      | 12 ++++++++++--
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index 089982c8..5b36923b 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,9 @@ pyver = $(shell $(PYTHON) -V 2>&1 | sed 's/^[^ ]* \([0-9]*\.[0-9]*\).*/\1/')
 
 SUBDIRS = sql
 
+# sql installation files we want to put into share/skytools
+SQLFILES = sql/txid/txid.sql sql/pgq/pgq.sql sql/londiste/londiste.sql sql/pgq_ext/pgq_ext.sql sql/logtriga/logtriga.sql
+
 all: python-all modules-all
 
 modules-all: config.mak
@@ -18,6 +21,8 @@ x$(MAKE):
 python-all: config.mak
 	$(PYTHON) setup.py build
 
+$(SQLFILES): modules-all
+
 clean:
 	$(MAKE) -C sql clean
 	$(MAKE) -C doc clean
@@ -39,10 +44,15 @@ modules-install: config.mak
 	$(MAKE) -C sql install DESTDIR=$(DESTDIR)
 	test \! -d compat || $(MAKE) -C compat $@ DESTDIR=$(DESTDIR)
 
-python-install: config.mak
+python-install: config.mak $(SQLFILES)
 	$(PYTHON) setup.py install --prefix=$(prefix) --root=$(DESTDIR)/
 	test \! -d compat || $(MAKE) -C compat $@ DESTDIR=$(DESTDIR)
 
+python-install python-all: python/skytools/installer_config.py
+python/skytools/installer_config.py: python/skytools/installer_config.py.in config.mak
+	sed -e 's!@SQLDIR@!$(SQLDIR)!g' $< > $@
+
+
 distclean: clean
 	for dir in $(SUBDIRS); do $(MAKE) -C $$dir $@ || exit 1; done
 	$(MAKE) -C doc $@
diff --git a/config.mak.in b/config.mak.in
index 233f2cdf..d1fdcc90 100644
--- a/config.mak.in
+++ b/config.mak.in
@@ -4,6 +4,8 @@ prefix = @prefix@
 override PYTHON = @PYTHON@
 override PG_CONFIG = @PG_CONFIG@
 
+SQLDIR = $(prefix)/share/skytools
+
 PGXS = $(shell $(PG_CONFIG) --pgxs)
 
 DESTDIR = /
diff --git a/configure.ac b/configure.ac
index 2e2466f9..62281e43 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,18 +36,6 @@ else
 fi
 AC_SUBST(MAKE)
 
-dnl Find location of /contrib SQL
-AC_MSG_CHECKING(where PostgreSQL SQL extensions are installed)
-cat > conftest.mak <<EOF
-PGXS = \$(shell $PG_CONFIG --pgxs)
-include \$(PGXS)
-finddir:
-	echo "\$(datadir)/contrib"
-EOF
-SQLDIR=`$MAKE -s -f conftest.mak finddir`
-AC_MSG_RESULT($SQLDIR)
-AC_SUBST(SQLDIR)
-
 dnl Write result
-AC_OUTPUT([config.mak python/skytools/installer_config.py])
+AC_OUTPUT([config.mak])
 
diff --git a/setup.py b/setup.py
index 26e59ff4..07717eb2 100755
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,8 @@ setup(
                'scripts/cube_dispatcher.py', 'scripts/queue_mover.py',
                'scripts/table_dispatcher.py', 'scripts/bulk_loader.py',
                'scripts/scriptmgr.py', 'scripts/queue_splitter.py'],
-    data_files = [ ('share/doc/skytools/conf', [
+    data_files = [
+      ('share/doc/skytools/conf', [
         'python/conf/londiste.ini',
         'python/conf/pgqadm.ini',
         'python/conf/wal-master.ini',
@@ -31,6 +32,13 @@ setup(
         'scripts/table_dispatcher.ini.templ',
         'scripts/bulk_loader.ini.templ',
         'scripts/scriptmgr.ini.templ',
-        ])]
+        ]),
+      ('share/skytools', [
+        'sql/txid/txid.sql',
+        'sql/pgq/pgq.sql',
+        'sql/londiste/londiste.sql',
+        'sql/pgq_ext/pgq_ext.sql',
+        'sql/logtriga/logtriga.sql',
+        ])],
 )
 
-- 
2.39.5