diff options
| author | marha <marha@users.sourceforge.net> | 2011-06-13 19:59:46 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-06-13 19:59:46 +0200 |
| commit | 0d495843cebea4ae94a3138db2bf51da80a16391 (patch) | |
| tree | 6e7b747c07035ae3a29ee3fb73e1eb43df7d2f8d /libX11 | |
| parent | 01b6bb489cc42ea112ed91dd1f2aeb90bc8e212b (diff) | |
| parent | f4babb3a422e27cd33fba36f7a21eb67b7dee25d (diff) | |
| download | vcxsrv-0d495843cebea4ae94a3138db2bf51da80a16391.tar.gz vcxsrv-0d495843cebea4ae94a3138db2bf51da80a16391.tar.bz2 vcxsrv-0d495843cebea4ae94a3138db2bf51da80a16391.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
X11/extensions/configure.ac
X11/xtrans/configure.ac
X11/xtrans/doc/Makefile.am
libX11/configure.ac
libX11/docbook.am
libXdmcp/configure.ac
libXdmcp/doc/Makefile.am
libXext/configure.ac
libXext/docbook.am
libXmu/configure.ac
libXmu/doc/Makefile.am
mesalib/src/mapi/glapi/gen/Makefile
mesalib/src/mapi/glapi/glapi.h
mesalib/src/mesa/state_tracker/st_draw.c
xorg-server/xkeyboard-config/rules/base.extras.xml.in
xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst
xorg-server/xkeyboard-config/symbols/de
Diffstat (limited to 'libX11')
| -rw-r--r-- | libX11/configure.ac | 2 | ||||
| -rw-r--r-- | libX11/docbook.am | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libX11/configure.ac b/libX11/configure.ac index 13d0188c7..027b4bb37 100644 --- a/libX11/configure.ac +++ b/libX11/configure.ac @@ -29,7 +29,7 @@ XORG_ENABLE_SPECS XORG_WITH_XMLTO(0.0.22)
XORG_WITH_FOP([no])
XORG_WITH_XSLTPROC
-XORG_CHECK_SGML_DOCTOOLS(1.7)
+XORG_CHECK_SGML_DOCTOOLS(1.8)
XORG_PROG_RAWCPP
# Required when PKG_CHECK_MODULES called within an if statement
diff --git a/libX11/docbook.am b/libX11/docbook.am index 94602521b..e94e975f6 100644 --- a/libX11/docbook.am +++ b/libX11/docbook.am @@ -72,7 +72,7 @@ if HAVE_STYLESHEETS if HAVE_XSLTPROC
# DocBook/XML generated document cross-reference database
-sgmldbs_DATA = $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db)
+shelf_DATA += $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db)
# Generate DocBook/XML document cross-reference database
# Flags for the XSL Transformation processor generating xref target databases
@@ -94,4 +94,4 @@ endif HAVE_XSLTPROC endif HAVE_STYLESHEETS
endif HAVE_XMLTO
-CLEANFILES = $(shelf_DATA) $(sgmldbs_DATA)
+CLEANFILES = $(shelf_DATA)
|