From: Colin Walters Date: Thu, 16 Jun 2005 04:32:50 +0000 (+0000) Subject: 2005-06-16 Colin Walters X-Git-Tag: dbus-0.35~54 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6fe36d8791a66ce9415b845c5152ca2b5ec87195;p=thirdparty%2Fdbus.git 2005-06-16 Colin Walters * 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 909f6f0cf..d288906a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-06-16 Colin Walters + + * 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 * dbus/dbus-marshal-header.c (_dbus_header_load): Set diff --git a/dbus/Makefile.am b/dbus/Makefile.am index 41a9929bd..879a34c7f 100644 --- 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 511bec8c9..e98a0277f 100644 --- 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 fffad0871..568dab3d6 100644 --- 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