From b6a3b8be31aa94e90858157365c86b1b78e041e2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?C=C3=A9dric=20Villemain?= <cedric@2ndquadrant.fr>
Date: Fri, 29 Jul 2011 11:23:32 +0200
Subject: [PATCH] Fix Makefile and remove sql/

The SQL files were moved to a subdir in the sources. (sql/)
It happens that it is useless and error prone.

Restore the original tree.
---
 ChangeLog                                                   | 3 +++
 Makefile                                                    | 6 +++---
 debian/postgresql-8.4-pgfincore.install                     | 4 ++--
 debian/postgresql-9.0-pgfincore.install                     | 4 ++--
 debian/postgresql-9.1-pgfincore.install                     | 2 +-
 ...e--unpackaged--1.0.sql => pgfincore--unpackaged--1.0.sql | 0
 sql/pgfincore.sql => pgfincore.sql                          | 0
 sql/uninstall_pgfincore.sql => uninstall_pgfincore.sql      | 0
 8 files changed, 11 insertions(+), 8 deletions(-)
 rename sql/pgfincore--unpackaged--1.0.sql => pgfincore--unpackaged--1.0.sql (100%)
 rename sql/pgfincore.sql => pgfincore.sql (100%)
 rename sql/uninstall_pgfincore.sql => uninstall_pgfincore.sql (100%)

diff --git a/ChangeLog b/ChangeLog
index c7b93a0..d5e6eb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+07/XX/2011 Cédric Villemain <cedric@villemain.org>
+  * 1.0.1 - Fix Makefile and remove the dir sql/ (useless and error prone)
+
 07/28/2011 Cédric Villemain <cedric@villemain.org>
   * 1.0.0 - Output varbit containing vector information with pgfincore*()
 		  - Add Debian packaging (Dimitri Fontaine)
diff --git a/Makefile b/Makefile
index 776a7d5..ed5ae31 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ EXTVERSION   = $(shell grep default_version $(SRCDIR)/$(EXTENSION).control | \
                sed -e "s/default_version[[:space:]]*=[[:space:]]*'\([^']*\)'/\1/")
 
 MODULES      = $(EXTENSION)
-DATA         = sql/pgfincore.sql sql/uninstall_pgfincore.sql
+DATA         = pgfincore.sql uninstall_pgfincore.sql
 DOCS         = README.rst
 
 PG_CONFIG    = pg_config
@@ -19,11 +19,11 @@ PG91         = $(shell $(PG_CONFIG) --version | grep -qE "8\.|9\.0" && echo no |
 ifeq ($(PG91),yes)
 all: pgfincore--$(EXTVERSION).sql
 
-pgfincore--$(EXTVERSION).sql: sql/pgfincore.sql
+pgfincore--$(EXTVERSION).sql: pgfincore.sql
 	cp $< $@
 
 DATA        = pgfincore--unpackaged--$(EXTVERSION).sql pgfincore--$(EXTVERSION).sql
-EXTRA_CLEAN = sql/$(EXTENSION)--$(EXTVERSION).sql
+EXTRA_CLEAN = $(EXTENSION)--$(EXTVERSION).sql
 endif
 
 PGXS := $(shell $(PG_CONFIG) --pgxs)
diff --git a/debian/postgresql-8.4-pgfincore.install b/debian/postgresql-8.4-pgfincore.install
index de17558..b9788b8 100644
--- a/debian/postgresql-8.4-pgfincore.install
+++ b/debian/postgresql-8.4-pgfincore.install
@@ -1,3 +1,3 @@
 debian/pgfincore-8.4/pgfincore.so usr/lib/postgresql/8.4/lib
-sql/pgfincore.sql usr/share/postgresql/8.4/contrib
-sql/uninstall_pgfincore.sql usr/share/postgresql/8.4/contrib
+pgfincore.sql usr/share/postgresql/8.4/contrib
+uninstall_pgfincore.sql usr/share/postgresql/8.4/contrib
diff --git a/debian/postgresql-9.0-pgfincore.install b/debian/postgresql-9.0-pgfincore.install
index 15dc5c7..fa2acbd 100644
--- a/debian/postgresql-9.0-pgfincore.install
+++ b/debian/postgresql-9.0-pgfincore.install
@@ -1,3 +1,3 @@
 debian/pgfincore-9.0/pgfincore.so usr/lib/postgresql/9.0/lib
-sql/pgfincore.sql usr/share/postgresql/9.0/contrib
-sql/uninstall_pgfincore.sql usr/share/postgresql/9.0/contrib
+pgfincore.sql usr/share/postgresql/9.0/contrib
+uninstall_pgfincore.sql usr/share/postgresql/9.0/contrib
diff --git a/debian/postgresql-9.1-pgfincore.install b/debian/postgresql-9.1-pgfincore.install
index 19bdbee..6b2d20b 100644
--- a/debian/postgresql-9.1-pgfincore.install
+++ b/debian/postgresql-9.1-pgfincore.install
@@ -1,4 +1,4 @@
 debian/pgfincore-9.1/pgfincore.so usr/lib/postgresql/9.1/lib
 debian/pgfincore-9.1/pgfincore*.sql usr/share/postgresql/9.1/extension
-sql/pgfincore--unpackaged--1.0.sql usr/share/postgresql/9.1/extension
+pgfincore--unpackaged--1.0.sql usr/share/postgresql/9.1/extension
 
diff --git a/sql/pgfincore--unpackaged--1.0.sql b/pgfincore--unpackaged--1.0.sql
similarity index 100%
rename from sql/pgfincore--unpackaged--1.0.sql
rename to pgfincore--unpackaged--1.0.sql
diff --git a/sql/pgfincore.sql b/pgfincore.sql
similarity index 100%
rename from sql/pgfincore.sql
rename to pgfincore.sql
diff --git a/sql/uninstall_pgfincore.sql b/uninstall_pgfincore.sql
similarity index 100%
rename from sql/uninstall_pgfincore.sql
rename to uninstall_pgfincore.sql
-- 
2.39.5