[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

D-BUS doesn't build in separate builddir



Hello,
D-BUS build/distcheck fails with separate builddir, the attached patch
fixes that.

What it doesn't fix is that --enable-tests must be passed to configure
in order to get complete distribution (glib/test-dbus-glib.c and maybe
other files are missing otherwise).
	Mirek
diff -ur dbus/doc/Makefile.am t/dbus/doc/Makefile.am
--- dbus/doc/Makefile.am	2003-05-04 01:07:19.000000000 +0200
+++ t/dbus/doc/Makefile.am	2003-06-29 02:44:14.000000000 +0200
@@ -11,14 +11,16 @@
 endif
 
 dbus-specification.html: dbus-specification.sgml
-	$(DB2HTML) -o . --nochunks dbus-specification.sgml &&	\
-	rm -r dbus-specification/stylesheet-images &&		\
-	(if test -d dbus-specification ; then rmdir dbus-specification ; fi)
+	$(DB2HTML) -o . --nochunks $< &&	\
+	rm -r $(srcdir)/dbus-specification/stylesheet-images &&		\
+	(if test -d $(srcdir)/dbus-specification ; then	\
+	rmdir $(srcdir)/dbus-specification ; fi)
 
 dbus-test-plan.html: dbus-test-plan.sgml
-	$(DB2HTML) -o . --nochunks dbus-test-plan.sgml &&		\
-	rm -r dbus-test-plan/stylesheet-images &&		\
-	(if test -d dbus-test-plan ; then rmdir dbus-test-plan ; fi)
+	$(DB2HTML) -o . --nochunks $< &&		\
+	rm -r $(srcdir)/dbus-test-plan/stylesheet-images &&		\
+	(if test -d $(srcdir)/dbus-test-plan ; then	\
+	rmdir $(srcdir)/dbus-test-plan ; fi)
 
 maintainer-clean-local:
 	rm -f dbus-test-plan.html
diff -ur dbus/test/Makefile.am t/dbus/test/Makefile.am
--- dbus/test/Makefile.am	2003-04-28 21:29:42.000000000 +0200
+++ t/dbus/test/Makefile.am	2003-06-29 02:59:07.000000000 +0200
@@ -70,10 +70,10 @@
 	for D in $(TESTDIRS); do						\
 		test -d $(distdir)/$$D || mkdir $(distdir)/$$D || exit 1 ;	\
 	done ;									\
-	FILES=`$(FIND_TESTS) -o -name "*.in"` ;					\
+	FILES=`(cd $(srcdir) && $(FIND_TESTS) -o -name "*.in" -a -not -name Makefile.in)` ;					\
         for F in $$FILES; do							\
                 echo '-- Disting file '$$F ;					\
-		cp $$F $(distdir)/$$F || exit 1 ;				\
+		cp $(srcdir)/$$F $(distdir)/$$F || exit 1 ;				\
 	done
 
 ## copy tests to builddir so that generated tests and static tests 

[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]