diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-10-22 22:15:59 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-10-22 22:15:59 +0200 |
| commit | 1d18ffa427852084c6bf378eaa76c2e9116cdea7 (patch) | |
| tree | b9aa383048f908be017cdc260cb60fa3df5699e0 /package/dbus | |
| parent | f3d0f13c125a7e24dda986656d42b4a28e2f8e70 (diff) | |
| parent | 4f14ea9a70f86fd29c59b617fa1449dd5b2f14ab (diff) | |
some adk devel corrections
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
mk/package.mk
Diffstat (limited to 'package/dbus')
| -rw-r--r-- | package/dbus/Makefile | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/package/dbus/Makefile b/package/dbus/Makefile index a099da821..46739bfa2 100644 --- a/package/dbus/Makefile +++ b/package/dbus/Makefile @@ -12,10 +12,13 @@ PKG_SECTION:= net PKG_DEPENDS:= libexpat PKG_URL:= http://dbus.freedesktop.org PKG_SITES:= http://dbus.freedesktop.org/releases/dbus/ +ifeq ($(ADK_STATIC),y) +PKG_OPTS:= libonly +endif include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,DBUS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(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 \ @@ -31,13 +34,15 @@ 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 + $(CP) $(WRKBUILD)/dbus/dbus-arch-deps.h \ + $(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} $(STAGING_DIR)/usr/include/dbus-1.0/dbus ${CP} ${WRKINST}/etc/dbus-1 ${IDIR_DBUS}/etc/ ${CP} ${WRKINST}/usr/lib/libdbus-1.so.* ${IDIR_DBUS}/usr/lib/ - $(CP) $(WRKINST)/usr/lib/dbus-1.0/include/dbus/dbus-arch-deps.h \ - $(STAGING_DIR)/usr/include/dbus-1.0/dbus/ ${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-daemon ${IDIR_DBUS}/usr/bin/ ${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-launch ${IDIR_DBUS}/usr/bin/ |