fix build in case xmlto is installed, and explicitly disable doc components

that don't get built reproducibly
This commit is contained in:
espie 2007-11-01 11:04:28 +00:00
parent cc9a22211a
commit 4cc7e97171
3 changed files with 32 additions and 6 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.9 2007/09/15 20:04:19 merdely Exp $
# $OpenBSD: Makefile,v 1.10 2007/11/01 11:04:28 espie Exp $
COMMENT= message system
@ -27,7 +27,9 @@ CONFIGURE_ENV= LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
CFLAGS="${CFLAGS} -I${LOCALBASE}/include -pthread"
CONFIGURE_ARGS= --localstatedir=/var \
--with-dbus-user=_dbus \
--with-xml=expat
--with-xml=expat \
--disable-xml-docs \
--disable-doxygen-docs
# Tests are disabled as they change the final dbus binaries
#CONFIGURE_ARGS= --enable-tests
#CONFIGURE_ARGS= --enable-verbose-mode

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-dbus-1_pc_in,v 1.2 2007/03/21 00:21:58 espie Exp $
--- dbus-1.pc.in.orig Thu Oct 26 20:06:07 2006
+++ dbus-1.pc.in Fri Dec 29 15:45:18 2006
@@ -9,6 +9,6 @@ session_bus_services_dir=@EXPANDED_DATAD
$OpenBSD: patch-dbus-1_pc_in,v 1.3 2007/11/01 11:04:28 espie Exp $
--- dbus-1.pc.in.orig Mon Dec 11 20:20:51 2006
+++ dbus-1.pc.in Thu Nov 1 11:49:45 2007
@@ -9,6 +9,6 @@ session_bus_services_dir=@EXPANDED_DATADIR@/dbus-1/ser
Name: dbus
Description: Free desktop message bus
Version: @VERSION@

View File

@ -0,0 +1,24 @@
$OpenBSD: patch-doc_Makefile_in,v 1.1 2007/11/01 11:04:28 espie Exp $
--- doc/Makefile.in.orig Tue Dec 12 20:41:48 2006
+++ doc/Makefile.in Thu Nov 1 12:00:18 2007
@@ -407,16 +407,16 @@ uninstall-am: uninstall-info-am
@DBUS_XML_DOCS_ENABLED_TRUE@all-local: $(HTML_FILES)
@DBUS_XML_DOCS_ENABLED_TRUE@dbus-specification.html: dbus-specification.xml
-@DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) html-nochunks $<
+@DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) html-nochunks $(srcdir)/dbus-specification.xml
@DBUS_XML_DOCS_ENABLED_TRUE@dbus-test-plan.html: dbus-test-plan.xml
-@DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) html-nochunks $<
+@DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) html-nochunks $(srcdir)/dbus-test-plan.xml
@DBUS_XML_DOCS_ENABLED_TRUE@dbus-tutorial.html: dbus-tutorial.xml
-@DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) html-nochunks $<
+@DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) html-nochunks $(srcdir)/dbus-tutorial.xml
@DBUS_XML_DOCS_ENABLED_TRUE@dbus-faq.html: dbus-faq.xml
-@DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) html-nochunks $<
+@DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) html-nochunks $(srcdir)/dbus-faq.xml
maintainer-clean-local:
rm -f $(HTML_FILES)