diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-07 22:01:27 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-07 22:01:27 +0100 |
| commit | 7de93724af9791bad0a8e887d02bf7a3a872305c (patch) | |
| tree | c4de7f2ecaa01cc7cf371eb3b771a6b8a8f9a9de /package/dbus | |
| parent | bd1730cdff6b88d54d5fdb3d63d5733ca33abe59 (diff) | |
| parent | 254ae86e16cddf282b36c0593148e24151ce1f96 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/dbus')
| -rw-r--r-- | package/dbus/Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/package/dbus/Makefile b/package/dbus/Makefile index 4dcb4067b..0e40fe548 100644 --- a/package/dbus/Makefile +++ b/package/dbus/Makefile @@ -13,6 +13,7 @@ PKG_DEPENDS:= libexpat PKG_BUILDDEP+= expat PKG_URL:= http://dbus.freedesktop.org PKG_SITES:= http://dbus.freedesktop.org/releases/dbus/ + ifeq ($(ADK_STATIC),y) PKG_OPTS:= libonly endif @@ -21,7 +22,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,DBUS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --disable-tests \ --disable-abstract-sockets \ --without-x \ @@ -32,8 +32,6 @@ CONFIGURE_ARGS+= --disable-tests \ --disable-xml-docs \ --disable-doxygen-docs CONFIGURE_ENV+= ac_cv_have_abstract_sockets=no -BUILD_STYLE:= auto -INSTALL_STYLE:= auto pre-install: ${INSTALL_DIR} $(STAGING_DIR)/usr/include/dbus-1.0/dbus @@ -41,7 +39,8 @@ pre-install: $(STAGING_DIR)/usr/include/dbus-1.0/dbus/ post-install: - ${INSTALL_DIR} ${IDIR_DBUS}/etc ${IDIR_DBUS}/usr/lib ${IDIR_DBUS}/usr/bin + ${INSTALL_DIR} ${IDIR_DBUS}/etc ${IDIR_DBUS}/usr/lib \ + ${IDIR_DBUS}/usr/bin ${CP} ${WRKINST}/etc/dbus-1 ${IDIR_DBUS}/etc/ ${CP} ${WRKINST}/usr/lib/libdbus-1.so.* ${IDIR_DBUS}/usr/lib/ ${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-daemon ${IDIR_DBUS}/usr/bin/ |