diff options
author | Robert Schwebel <r.schwebel@pengutronix.de> | 2008-08-01 21:09:01 +0000 |
---|---|---|
committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2008-08-01 21:09:01 +0000 |
commit | fdd75d32b32f42184fe42a2e964196d09187099d (patch) | |
tree | 32692dda7a46ed265929b030981087af9b39394f /rules/dbus-glib.make | |
parent | dfbc6b7fad49d1f59b2d4c82f253abbb1a2a1a34 (diff) | |
download | ptxdist-fdd75d32b32f42184fe42a2e964196d09187099d.tar.gz ptxdist-fdd75d32b32f42184fe42a2e964196d09187099d.tar.xz |
* dbus-glib: fix cross compilation and installation stage
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@8715 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/dbus-glib.make')
-rw-r--r-- | rules/dbus-glib.make | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/rules/dbus-glib.make b/rules/dbus-glib.make index c02a40751..8edd17457 100644 --- a/rules/dbus-glib.make +++ b/rules/dbus-glib.make @@ -48,20 +48,15 @@ DBUS_GLIB_ENV := \ # # autoconf # -DBUS_GLIB_AUTOCONF := \ +# use = here, not := +DBUS_GLIB_AUTOCONF = \ $(CROSS_AUTOCONF_USR) \ --disable-tests \ --disable-doxygen-docs \ --disable-gcov \ --disable-gtk-doc \ - --with-dbus-binding-tool=$(PTXCONF_SYSROOT_HOST)/bin/dbus-binding-tool - -# --with-test-socket-dir=dirname -# Where to put sockets for make check -# --with-introspect-xml=filename -# Pass in a pregenerated dbus daemon introspection xml -# file (as generated by 'dbus-daemon --introspect') to -# use instead of querying the installed dbus daemon + --with-dbus-binding-tool=$(PTXCONF_SYSROOT_HOST)/bin/dbus-binding-tool \ + --with-introspect-xml=$(HOST_DBUS_GLIB_DIR)/tools/dbus-bus-introspect.xml # ---------------------------------------------------------------------------- # Target-Install @@ -79,7 +74,17 @@ $(STATEDIR)/dbus-glib.targetinstall: @$(call install_fixup, dbus-glib,DEPENDS,) @$(call install_fixup, dbus-glib,DESCRIPTION,missing) -# @$(call install_copy, dbus-glib, 0, 0, 0755, $(DBUS_GLIB_DIR)/foobar, /dev/null) + @$(call install_copy, dbus-glib, 0, 0, 0755, \ + $(PKGDIR)/$(DBUS_GLIB)/usr/bin/dbus-binding-tool, \ + /usr/bin/dbus-binding-tool) + + @$(call install_copy, dbus-glib, 0, 0, 0644, \ + $(PKGDIR)/$(DBUS_GLIB)/usr/lib/libdbus-glib-1.so.2.1.0, \ + /usr/lib/libdbus-glib-1.so.2.1.0) + @$(call install_link, dbus-glib, libdbus-glib-1.so.2.1.0, \ + /usr/lib/libdbus-glib-1.so.2) + @$(call install_link, dbus-glib, libdbus-glib-1.so.2.1.0, \ + /usr/lib/libdbus-glib-1.so) @$(call install_finish, dbus-glib) |