From: Miloslav Trmac <mitr@volny.cz>
Date: Sun, 29 Jun 2003 15:35:06 +0000 (+0000)
Subject: 2003-06-29  Miloslav Trmac  <mitr@volny.cz>
X-Git-Tag: dbus-object-names-branchpoint~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc2743e206a9b056f6f306e8e1365f8a03afa2bf;p=thirdparty%2Fdbus.git

2003-06-29  Miloslav Trmac  <mitr@volny.cz>

	* doc/Makefile.am:
	* tools/Makefile.am: Don't assume srcdir == builddir.
---

diff --git a/ChangeLog b/ChangeLog
index 55b09ed30..9846b24a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-06-29  Miloslav Trmac  <mitr@volny.cz>
 
+	* doc/Makefile.am:
+	* tools/Makefile.am: Don't assume srcdir == builddir.
+
 	* dbus/dbus-memory.c (dbus_realloc): Don't check guards after shrinking
 	the allocated block.
 	(_dbus_memory_test): New function.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index da1d011ae..891c02099 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -11,14 +11,16 @@ all-local: dbus-specification.html dbus-test-plan.html
 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 --git a/test/Makefile.am b/test/Makefile.am
index 227f0dba5..04df3510c 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -70,10 +70,10 @@ dist-hook:
 	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