diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-21 20:57:35 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-21 20:57:35 +0200 |
commit | 4dc2822fa71e8e3d3ab004c8c14867607bb4de06 (patch) | |
tree | 21e5b36849ea23f526cc58578a540de3882d7376 /package/dbus-glib/patches/patch-dbus_Makefile_in | |
parent | 8f1eff09d5706cbea36ddf1bfc4661579f688853 (diff) | |
parent | 38910b0bc0393c60da90e1b2540e3d4c5858dae9 (diff) |
resolve merge conflict
Diffstat (limited to 'package/dbus-glib/patches/patch-dbus_Makefile_in')
-rw-r--r-- | package/dbus-glib/patches/patch-dbus_Makefile_in | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/package/dbus-glib/patches/patch-dbus_Makefile_in b/package/dbus-glib/patches/patch-dbus_Makefile_in new file mode 100644 index 000000000..161f53563 --- /dev/null +++ b/package/dbus-glib/patches/patch-dbus_Makefile_in @@ -0,0 +1,11 @@ +--- dbus-glib-0.86.orig/dbus/Makefile.in 2010-03-25 01:19:59.000000000 +0100 ++++ dbus-glib-0.86/dbus/Makefile.in 2010-04-11 12:15:19.000000000 +0200 +@@ -369,7 +369,7 @@ target_vendor = @target_vendor@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-SUBDIRS = . examples ++SUBDIRS = . + INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_builddir) \ |