2005-06-16 Colin Walters <walters@verbum.org>

	* dbus/Makefile.am:
	* mono/doc/Makefile.am:
	* test/glib/Makefile.am:

	Fix srcdir != builddir issues (Patch from Chris Wilson, #3477)

diff --git a/ChangeLog b/ChangeLog
index 909f6f0cf6730ca57dd6fe079351b22c36b30c38..d288906a9b3695a56fa1de27318b8dec60b24917 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-06-16  Colin Walters  <walters@verbum.org>
+
+       * dbus/Makefile.am:
+       * mono/doc/Makefile.am:
+       * test/glib/Makefile.am:
+
+       Fix srcdir != builddir issues (Patch from Chris Wilson, #3477)
+
 2005-06-16  Colin Walters  <walters@verbum.org>
 
        * dbus/dbus-marshal-header.c (_dbus_header_load): Set

diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index 41a9929bd3a54bbd4ee9949b70feeeb55b5c69d5..879a34c7fab799ab00a96abe0c8980d09b4cd910 100644 (file)
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -11,7 +11,7 @@ GLIB_INCLUDES=                                        \
        $(DBUS_GLIB_BUILT_INCLUDES)
 
 dbus-glib-error-enum.h: dbus-protocol.h make-dbus-glib-error-enum.sh
-       $(srcdir)/make-dbus-glib-error-enum.sh dbus-protocol.h $@
+       $(srcdir)/make-dbus-glib-error-enum.sh $(srcdir)/dbus-protocol.h $@
 
 endif
 

diff --git a/mono/doc/Makefile.am b/mono/doc/Makefile.am
index 511bec8c9a5d0f6ae5a309ce98d9423e791fc9c8..e98a0277fa52d3fcb7ba8875c9b93c6214d17507 100644 (file)
--- a/mono/doc/Makefile.am
+++ b/mono/doc/Makefile.am
@@ -5,8 +5,8 @@ DOCDIR = `$(MONODOC) --get-sourcesdir`
 install-data-local:
        install -d -m 755 $(DESTDIR)/`monodoc --get-sourcesdir`
        install -m 644 $(srcdir)/dbus-sharp-docs.source $(DESTDIR)/`monodoc --get-sourcesdir`
-       install -m 644 $(srcdir)/dbus-sharp-docs.tree $(DESTDIR)/`monodoc --get-sourcesdir`
-       install -m 644 $(srcdir)/dbus-sharp-docs.zip $(DESTDIR)/`monodoc --get-sourcesdir`
+       install -m 644 dbus-sharp-docs.tree $(DESTDIR)/`monodoc --get-sourcesdir`
+       install -m 644 dbus-sharp-docs.zip $(DESTDIR)/`monodoc --get-sourcesdir`
 
 uninstall-local:
        rm -f $(DESTDIR)/`monodoc --get-sourcesdir`/dbus-sharp-docs.source

diff --git a/test/glib/Makefile.am b/test/glib/Makefile.am
index fffad08713518f63be4023af7180c155617b3ee6..568dab3d6655bcfb7e43491e33dc64018d07213f 100644 (file)
--- a/test/glib/Makefile.am
+++ b/test/glib/Makefile.am
@@ -45,10 +45,10 @@ test_service_glib_SOURCES=                          \
 BUILT_SOURCES = test-service-glib-glue.h test-service-glib-bindings.h
 
 test-service-glib-glue.h: test-service-glib.xml $(top_builddir)/glib/dbus-binding-tool
-       $(top_builddir)/glib/dbus-binding-tool --prefix=my_object --mode=glib-server --output=test-service-glib-glue.h test-service-glib.xml
+       $(top_builddir)/glib/dbus-binding-tool --prefix=my_object --mode=glib-server --output=test-service-glib-glue.h $(srcdir)/test-service-glib.xml
 
 test-service-glib-bindings.h: test-service-glib.xml $(top_builddir)/glib/dbus-binding-tool
-       $(top_builddir)/glib/dbus-binding-tool --prefix=my_object --mode=glib-client --output=test-service-glib-bindings.h test-service-glib.xml
+       $(top_builddir)/glib/dbus-binding-tool --prefix=my_object --mode=glib-client --output=test-service-glib-bindings.h $(srcdir)/test-service-glib.xml
 
 CLEANFILES = test-service-glib-glue.h test-service-glib-bindings.h