Update build system.

diff --git a/contrib/xml/Makefile b/contrib/xml/Makefile
index a75ac095f607909d5dd66bba4aecd4f94a21c91e..2b4e96a381c82d401e82047dde0070c580ba0abb 100644 (file)
--- a/contrib/xml/Makefile
+++ b/contrib/xml/Makefile
@@ -1,45 +1,13 @@
-#-------------------------------------------------------------------------
-#
-# Makefile--
-# Adapted from tutorial makefile
-#-------------------------------------------------------------------------
+# $Header: /cvsroot/pgsql/contrib/xml/Attic/Makefile,v 1.3 2002/10/22 20:03:09 petere Exp $
 
 subdir = contrib/xml
 top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 
-override CFLAGS+= $(CFLAGS_SL) -g
-
-
-#
-# DLOBJS is the dynamically-loaded object files.  The "funcs" queries
-# include CREATE FUNCTIONs that load routines from these files.
-#
-DLOBJS= pgxml_dom$(DLSUFFIX)
-
-
-QUERIES= pgxml_dom.sql
-
-all: $(DLOBJS) $(QUERIES)
-
-%.so: %.o
-       $(CC) -shared -lxml2 -o $@ $<
-
-
-%.sql: %.source
-       if [ -z "$$USER" ]; then USER=$$LOGNAME; fi; \
-       if [ -z "$$USER" ]; then USER=`whoami`; fi; \
-       if [ -z "$$USER" ]; then echo 'Cannot deduce $$USER.'; exit 1; fi; \
-       rm -f $@; \
-       C=`pwd`; \
-       sed -e "s:_CWD_:$$C:g" \
-           -e "s:_OBJWD_:$$C:g" \
-           -e "s:_DLSUFFIX_:$(DLSUFFIX):g" \
-           -e "s/_USER_/$$USER/g" < $< > $@
-
-clean:
-       rm -f $(DLOBJS) $(QUERIES)
-
-
-
+MODULE_big = pgxml_dom
+OBJS = pgxml_dom.o
+SHLIB_LINK = -lxml2
+DATA_built = pgxml_dom.sql
+DOCS = README.pgxml
 
+include $(top_srcdir)/contrib/contrib-global.mk

diff --git a/contrib/xml/README b/contrib/xml/README.pgxml
similarity index 100%
rename from contrib/xml/README
rename to contrib/xml/README.pgxml

diff --git a/contrib/xml/pgxml.source b/contrib/xml/pgxml.source
deleted file mode 100644 (file)
index 8a04fa2..0000000
--- a/contrib/xml/pgxml.source
+++ /dev/null
@@ -1,7 +0,0 @@
---SQL for XML parser
-
-CREATE FUNCTION pgxml_parse(text) RETURNS bool
-       AS '_OBJWD_/pgxml_DLSUFFIX_' LANGUAGE 'c' WITH (isStrict);
-
-CREATE FUNCTION pgxml_xpath(text,text,text,text) RETURNS text
-       AS '_OBJWD_/pgxml_DLSUFFIX_' LANGUAGE 'c' WITH (isStrict);
\ No newline at end of file

diff --git a/contrib/xml/pgxml.sql.in b/contrib/xml/pgxml.sql.in
new file mode 100644 (file)
index 0000000..0814baa
--- /dev/null
+++ b/contrib/xml/pgxml.sql.in
@@ -0,0 +1,12 @@
+-- SQL for XML parser
+
+-- Adjust this setting to control where the objects get created.
+SET search_path TO public;
+
+SET autocommit TO on;
+
+CREATE OR REPLACE FUNCTION pgxml_parse(text) RETURNS boolean
+    AS 'MODULE_PATHNAME' LANGUAGE c STRICT;
+
+CREATE OR REPLACE FUNCTION pgxml_xpath(text, text, text, text) RETURNS text
+    AS 'MODULE_PATHNAME' LANGUAGE c STRICT;

diff --git a/contrib/xml/pgxml_dom.source b/contrib/xml/pgxml_dom.source
deleted file mode 100644 (file)
index d5272d7..0000000
--- a/contrib/xml/pgxml_dom.source
+++ /dev/null
@@ -1,16 +0,0 @@
---SQL for XML parser
-
--- Adjust this setting to control where the objects get created.
-SET search_path = public;
-
-SET autocommit TO 'on';
-
-CREATE OR REPLACE FUNCTION pgxml_parse(text)
-RETURNS bool
-AS '_OBJWD_/pgxml_dom_DLSUFFIX_'
-LANGUAGE 'c' WITH (isStrict);
-
-CREATE OR REPLACE FUNCTION pgxml_xpath(text,text,text,text)
-RETURNS text
-AS '_OBJWD_/pgxml_dom_DLSUFFIX_'
-LANGUAGE 'c' WITH (isStrict);

diff --git a/contrib/xml/pgxml_dom.sql.in b/contrib/xml/pgxml_dom.sql.in
new file mode 100644 (file)
index 0000000..0814baa
--- /dev/null
+++ b/contrib/xml/pgxml_dom.sql.in
@@ -0,0 +1,12 @@
+-- SQL for XML parser
+
+-- Adjust this setting to control where the objects get created.
+SET search_path TO public;
+
+SET autocommit TO on;
+
+CREATE OR REPLACE FUNCTION pgxml_parse(text) RETURNS boolean
+    AS 'MODULE_PATHNAME' LANGUAGE c STRICT;
+
+CREATE OR REPLACE FUNCTION pgxml_xpath(text, text, text, text) RETURNS text
+    AS 'MODULE_PATHNAME' LANGUAGE c STRICT;