database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-20 00:42:27 +03:00
Code

Fix contrib/xml2 makefile to not override CFLAGS, and in passing make it

Browse Source 
auto-configure properly for libxslt present or not.
This commit is contained in:
Tom Lane 2008-05-08 16:49:48 +00:00
parent d67134d129
commit 65a1e96c1d
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/Makefile
View File

@ -1,4 +1,4 @@
# $PostgreSQL: pgsql/contrib/Makefile,v 1.82 2007/11/13 21:04:45 tgl Exp $ # $PostgreSQL: pgsql/contrib/Makefile,v 1.82.2.1 2008/05/08 16:49:47 tgl Exp $
subdir = contrib subdir = contrib
top_builddir = .. top_builddir = ..
@ -46,10 +46,8 @@ WANTED_DIRS += uuid-ossp
endif endif
ifeq ($(with_libxml),yes) ifeq ($(with_libxml),yes)
ifeq ($(with_libxslt),yes)
WANTED_DIRS += xml2 WANTED_DIRS += xml2
endif endif
endif
# Missing: # Missing:
# start-scripts \ (does not have a makefile) # start-scripts \ (does not have a makefile)

10
contrib/xml2/Makefile
View File

@ -1,18 +1,14 @@
# $PostgreSQL: pgsql/contrib/xml2/Makefile,v 1.11 2007/11/10 23:59:52 momjian Exp $ # $PostgreSQL: pgsql/contrib/xml2/Makefile,v 1.11.2.1 2008/05/08 16:49:47 tgl Exp $
MODULE_big = pgxml MODULE_big = pgxml
# Remove xslt_proc.o from the following line if you don't have libxslt OBJS = $(if $(filter -lxslt, $(LIBS)), xpath.o xslt_proc.o, xpath.o)
OBJS = xpath.o xslt_proc.o
# Remove -lxslt from the following line if you don't have libxslt. SHLIB_LINK += $(filter -lxslt, $(LIBS)) $(filter -lxml2, $(LIBS))
SHLIB_LINK = -lxslt -lxml2
DATA_built = pgxml.sql DATA_built = pgxml.sql
DATA = uninstall_pgxml.sql DATA = uninstall_pgxml.sql
override CFLAGS += $(shell xml2-config --cflags)
ifdef USE_PGXS ifdef USE_PGXS
PG_CONFIG = pg_config PG_CONFIG = pg_config
PGXS := $(shell $(PG_CONFIG) --pgxs) PGXS := $(shell $(PG_CONFIG) --pgxs)

6
doc/src/sgml/xml2.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/xml2.sgml,v 1.4 2007/12/06 04:12:10 tgl Exp $ --> <!-- $PostgreSQL: pgsql/doc/src/sgml/xml2.sgml,v 1.4.2.1 2008/05/08 16:49:48 tgl Exp $ -->
<sect1 id="xml2"> <sect1 id="xml2">
<title>xml2</title> <title>xml2</title>
@ -374,9 +374,7 @@ WHERE t.author_id = p.person_id;
<title>XSLT functions</title> <title>XSLT functions</title>
<para> <para>
The following functions are available if libxslt is installed (this is The following functions are available if libxslt is installed:
not currently detected automatically, so you will have to amend the
Makefile):
</para> </para>
<sect3> <sect3>