Skip to content
Browse files

SQL scripts moved into sql directory

  • Loading branch information...
1 parent ba04185 commit d99bcb58fb7d616753b5f7ab1914081c43b4e1d7 @dvarrazzo committed Apr 21, 2011
Showing with 7 additions and 7 deletions.
  1. +6 −6 Makefile
  2. 0 { → sql}/pgmp.pysql
  3. 0 { → sql}/uninstall_pgmp.sql
  4. +1 −1 test/sql/setup-pre91.sql
View
12 Makefile
@@ -42,17 +42,17 @@ TESTFILES = $(wildcard test/sql/*.sql) $(wildcard test/expected/*.out)
DOCS = $(wildcard docs/*.rst) docs/conf.py docs/Makefile docs/_static/pgmp.css
PKGFILES = AUTHORS COPYING README Makefile \
- pgmp.control pgmp.pysql uninstall_pgmp.sql \
+ pgmp.control sql/pgmp.pysql sql/uninstall_pgmp.sql \
$(SRCFILES) $(DOCS) $(TESTFILES) \
$(wildcard tools/*.py)
ifeq ($(PG91),91)
-INSTALLSCRIPT=pgmp--$(PGMP_VERSION).sql
-UPGRADESCRIPT=pgmp--unpackaged--$(PGMP_VERSION).sql
+INSTALLSCRIPT=sql/pgmp--$(PGMP_VERSION).sql
+UPGRADESCRIPT=sql/pgmp--unpackaged--$(PGMP_VERSION).sql
DATA = $(INSTALLSCRIPT) $(UPGRADESCRIPT)
else
-INSTALLSCRIPT=pgmp.sql
-DATA = $(INSTALLSCRIPT) uninstall_pgmp.sql
+INSTALLSCRIPT=sql/pgmp.sql
+DATA = $(INSTALLSCRIPT) sql/uninstall_pgmp.sql
endif
# the += doesn't work if the user specified his own REGRESS_OPTS
@@ -69,7 +69,7 @@ include $(PGXS)
# added to the targets defined in pgxs
all: $(INSTALLSCRIPT) $(UPGRADESCRIPT)
-$(INSTALLSCRIPT): pgmp.pysql
+$(INSTALLSCRIPT): sql/pgmp.pysql
tools/unmix.py < $< > $@
$(UPGRADESCRIPT): $(INSTALLSCRIPT)
View
0 pgmp.pysql → sql/pgmp.pysql
File renamed without changes.
View
0 uninstall_pgmp.sql → sql/uninstall_pgmp.sql
File renamed without changes.
View
2 test/sql/setup-pre91.sql
@@ -5,7 +5,7 @@ SET client_min_messages = warning;
-- Setup the extension on PostgreSQL before 9.1
-\i pgmp.sql
+\i sql/pgmp.sql
\set ECHO all
RESET client_min_messages;

0 comments on commit d99bcb5

Please sign in to comment.
Something went wrong with that request. Please try again.