Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit8f012ac

Browse files
author
Neil Conway
committed
Contrib build fixes:
- add some additional files to the dbmirror install (approved byssinger)- add a makefile for contrib/mysql, and add mysql to the list ofcontribs build by default- use xml2-config to pickup -I flags for libxml2 in contrib/xml andcontrib/xml2Original work from Martin Pitt of Debian, minor cleanups by NeilConway.
1 parent4fbdfbf commit8f012ac

File tree

6 files changed

+26
-5
lines changed

6 files changed

+26
-5
lines changed

‎contrib/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $PostgreSQL: pgsql/contrib/Makefile,v 1.51 2004/09/16 21:20:19 tgl Exp $
1+
# $PostgreSQL: pgsql/contrib/Makefile,v 1.52 2004/11/04 06:09:17 neilc Exp $
22

33
subdir = contrib
44
top_builddir = ..
@@ -22,6 +22,7 @@ WANTED_DIRS = \
2222
lo\
2323
ltree\
2424
miscutil\
25+
mysql\
2526
noupdate\
2627
oid2name\
2728
pg_autovacuum\
@@ -47,7 +48,6 @@ WANTED_DIRS = \
4748
#ipc_check\ (does not have a makefile)
4849
#mSQL-interface\ (requires msql installed)
4950
#mac\ (does not have a makefile)
50-
#mysql\ (does not have a makefile)
5151
#oracle\ (does not have a makefile)
5252
#pg_upgrade\ (does not have a makefile)
5353
#reindexdb\ (does not have a makefile)

‎contrib/dbmirror/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
# $PostgreSQL: pgsql/contrib/dbmirror/Makefile,v 1.3 2004/08/20 20:13:03 momjian Exp $
1+
# $PostgreSQL: pgsql/contrib/dbmirror/Makefile,v 1.4 2004/11/04 06:09:19 neilc Exp $
22

33
MODULES = pending
4+
SCRIPTS = clean_pending.pl DBMirror.pl
5+
DATA = AddTrigger.sql MirrorSetup.sql slaveDatabase.conf
46
DOCS = README.dbmirror
57

68
ifdefUSE_PGXS

‎contrib/mysql/Makefile

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# mysql conversion Perl scripts
2+
# $PostgreSQL: pgsql/contrib/mysql/Makefile,v 1.1 2004/11/04 06:09:21 neilc Exp $
3+
4+
MODULES =
5+
SCRIPTS = my2pg.pl mysql2pgsql
6+
DOCS = README.mysql
7+
8+
ifdefUSE_PGXS
9+
PGXS =$(shell pg_config --pgxs)
10+
include$(PGXS)
11+
else
12+
subdir = contrib/mysql
13+
top_builddir = ../..
14+
include$(top_builddir)/src/Makefile.global
15+
include$(top_srcdir)/contrib/contrib-global.mk
16+
endif

‎contrib/mysql/mysql2pgsql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# -*-perl -*-
1+
#!/usr/bin/perl
22
# mysql2pgsql
33
# Take a MySQL schema dump and turn it into SQL92 and PostgreSQL form.
44
# Thomas Lockhart, (c) 2000, PostgreSQL Inc.

‎contrib/xml/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
# $Header: /cvsroot/pgsql/contrib/xml/Attic/Makefile,v 1.9 2004/08/20 20:13:10 momjian Exp $
1+
# $PostgreSQL:pgsql/contrib/xml/Makefile,v 1.10 2004/11/04 06:09:23 neilc Exp $
22

33
MODULE_big = pgxml_dom
44
OBJS = pgxml_dom.o
55
SHLIB_LINK = -lxml2
66
DATA_built = pgxml_dom.sql
77
DOCS = README.xml
88

9+
overrideCFLAGS +=$(shell xml2-config --cflags)
10+
911
ifdefUSE_PGXS
1012
PGXS =$(shell pg_config --pgxs)
1113
include$(PGXS)

‎contrib/xml2/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ SHLIB_LINK = -lxml2 -lxslt
1111
DATA_built = pgxml.sql
1212
DOCS = README.xml2
1313

14+
overrideCFLAGS +=$(shell xml2-config --cflags)
1415

1516
ifdefUSE_PGXS
1617
PGXS =$(shell pg_config --pgxs)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp