Install .sql files separately under $prefix/share/skytools

for usage for python scripts, because they may be installed
without installing postgres modules.

diff --git a/Makefile b/Makefile
index 089982c89b5b74e9904ccef2341a90831ab06b0e..5b36923b292ee73c2223ad0844192b5015d51866 100644 (file)
--- 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 233f2cdfc7b3df9aa53f942beb530bc63f8d921c..d1fdcc906e82669c708bb1629b6d2f4d4652417b 100644 (file)
--- 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 2e2466f9139d2063875a2307bc5afd4971879db7..62281e4331317eaf3b47e3d6dab015bbc0916fee 100644 (file)
--- 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 26e59ff4f6b73fcc06685d01d303d51d85f74660..07717eb24d2c30bb08fc9f341f4c3ef8ebb99e2b 100755 (executable)
--- 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',
+        ])],
 )