summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Conway2004-11-04 06:09:26 +0000
committerNeil Conway2004-11-04 06:09:26 +0000
commite0de6eb577dbeefa13b2f68ca079e717e620ac60 (patch)
tree9907c54cc694adb644fe1baaead7dc4afe6e88c9
parent085d55e04f0f4ee62344e9eacf37ea915a11adfa (diff)
Contrib build fixes:
- add some additional files to the dbmirror install (approved by ssinger) - add a makefile for contrib/mysql, and add mysql to the list of contribs build by default - use xml2-config to pickup -I flags for libxml2 in contrib/xml and contrib/xml2 Original work from Martin Pitt of Debian, minor cleanups by Neil Conway.
-rw-r--r--contrib/Makefile2
-rw-r--r--contrib/dbmirror/Makefile2
-rw-r--r--contrib/mysql/Makefile16
-rwxr-xr-xcontrib/mysql/mysql2pgsql2
-rw-r--r--contrib/xml/Makefile4
-rw-r--r--contrib/xml2/Makefile1
6 files changed, 24 insertions, 3 deletions
diff --git a/contrib/Makefile b/contrib/Makefile
index 3a5f40927d..e282be0da6 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -22,6 +22,7 @@ WANTED_DIRS = \
lo \
ltree \
miscutil \
+ mysql \
noupdate \
oid2name \
pg_autovacuum \
@@ -47,7 +48,6 @@ WANTED_DIRS = \
# ipc_check \ (does not have a makefile)
# mSQL-interface \ (requires msql installed)
# mac \ (does not have a makefile)
-# mysql \ (does not have a makefile)
# oracle \ (does not have a makefile)
# pg_upgrade \ (does not have a makefile)
# reindexdb \ (does not have a makefile)
diff --git a/contrib/dbmirror/Makefile b/contrib/dbmirror/Makefile
index 6cd776a51e..952da5601f 100644
--- a/contrib/dbmirror/Makefile
+++ b/contrib/dbmirror/Makefile
@@ -1,6 +1,8 @@
# $PostgreSQL$
MODULES = pending
+SCRIPTS = clean_pending.pl DBMirror.pl
+DATA = AddTrigger.sql MirrorSetup.sql slaveDatabase.conf
DOCS = README.dbmirror
ifdef USE_PGXS
diff --git a/contrib/mysql/Makefile b/contrib/mysql/Makefile
new file mode 100644
index 0000000000..8028f17503
--- /dev/null
+++ b/contrib/mysql/Makefile
@@ -0,0 +1,16 @@
+# mysql conversion Perl scripts
+# $PostgreSQL$
+
+MODULES =
+SCRIPTS = my2pg.pl mysql2pgsql
+DOCS = README.mysql
+
+ifdef USE_PGXS
+PGXS = $(shell pg_config --pgxs)
+include $(PGXS)
+else
+subdir = contrib/mysql
+top_builddir = ../..
+include $(top_builddir)/src/Makefile.global
+include $(top_srcdir)/contrib/contrib-global.mk
+endif
diff --git a/contrib/mysql/mysql2pgsql b/contrib/mysql/mysql2pgsql
index a51dfde53e..dfe5d6ffa2 100755
--- a/contrib/mysql/mysql2pgsql
+++ b/contrib/mysql/mysql2pgsql
@@ -1,4 +1,4 @@
-# -*- perl -*-
+#!/usr/bin/perl
# mysql2pgsql
# Take a MySQL schema dump and turn it into SQL92 and PostgreSQL form.
# Thomas Lockhart, (c) 2000, PostgreSQL Inc.
diff --git a/contrib/xml/Makefile b/contrib/xml/Makefile
index 363ec9881f..e39a19fd72 100644
--- a/contrib/xml/Makefile
+++ b/contrib/xml/Makefile
@@ -1,4 +1,4 @@
-# $Header$
+# $PostgreSQL$
MODULE_big = pgxml_dom
OBJS = pgxml_dom.o
@@ -6,6 +6,8 @@ SHLIB_LINK = -lxml2
DATA_built = pgxml_dom.sql
DOCS = README.xml
+override CFLAGS += $(shell xml2-config --cflags)
+
ifdef USE_PGXS
PGXS = $(shell pg_config --pgxs)
include $(PGXS)
diff --git a/contrib/xml2/Makefile b/contrib/xml2/Makefile
index b2a4f2325e..7d4779f25c 100644
--- a/contrib/xml2/Makefile
+++ b/contrib/xml2/Makefile
@@ -11,6 +11,7 @@ SHLIB_LINK = -lxml2 -lxslt
DATA_built = pgxml.sql
DOCS = README.xml2
+override CFLAGS += $(shell xml2-config --cflags)
ifdef USE_PGXS
PGXS = $(shell pg_config --pgxs)