diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-03-13 22:17:52 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-03-13 22:17:52 +0100 |
| commit | 0dd1969c3517fec51550e43799ad8dc801d573e0 (patch) | |
| tree | ec12d21e67d2cf77e4085bc6b05a305c2623e512 /package/dbus | |
| parent | 845e6343c2626a05cdc9f7aec0e1e1fd7174437e (diff) | |
| parent | 5b1ef5ec98175c6b50fe43bc651702821fc8e8df (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/dbus')
| -rw-r--r-- | package/dbus/Makefile | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/package/dbus/Makefile b/package/dbus/Makefile index 2a400abad..fb4f05b67 100644 --- a/package/dbus/Makefile +++ b/package/dbus/Makefile @@ -14,13 +14,18 @@ PKG_BUILDDEP:= expat PKG_URL:= http://dbus.freedesktop.org/ PKG_SITES:= http://dbus.freedesktop.org/releases/dbus/ +PKG_SUBPKGS:= DBUS DBUS_DEV +PKGSC_DBUS_DEV:= devel +PKGSD_DBUS_DEV:= DBUS headers + 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},${PKG_OPTS})) +$(eval $(call PKG_template,DBUS,dbus,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call PKG_template,DBUS_DEV,dbus-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DBUS_DEV},${PKGSC_DBUS_DEV},${PKG_OPTS})) CONFIGURE_ARGS+= --disable-tests \ --disable-abstract-sockets \ @@ -34,16 +39,26 @@ CONFIGURE_ARGS+= --disable-tests \ CONFIGURE_ENV+= ac_cv_have_abstract_sockets=no pre-install: - ${INSTALL_DIR} $(STAGING_TARGET_DIR)/usr/include/dbus-1.0/dbus + ${INSTALL_DIR} $(STAGING_DIR)/usr/include/dbus-1.0/dbus $(CP) $(WRKBUILD)/dbus/dbus-arch-deps.h \ - $(STAGING_TARGET_DIR)/usr/include/dbus-1.0/dbus/ + $(STAGING_DIR)/usr/include/dbus-1.0/dbus -post-install: +dbus-install: ${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/ - ${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-launch ${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 + ${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-launch ${IDIR_DBUS}/usr/bin + +dbus-dev-install: + ${INSTALL_DIR} ${IDIR_DBUS_DEV}/usr/include + ${CP} ${WRKINST}/usr/include/* ${IDIR_DBUS_DEV}/usr/include + ${INSTALL_DIR} $(IDIR_DBUS_DEV)/usr/include/dbus-1.0/dbus + $(CP) $(WRKBUILD)/dbus/dbus-arch-deps.h \ + $(IDIR_DBUS_DEV)/usr/include/dbus-1.0/dbus + ${INSTALL_DIR} ${IDIR_DBUS_DEV}/usr/lib/pkgconfig + ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \ + ${IDIR_DBUS_DEV}/usr/lib/pkgconfig include ${TOPDIR}/mk/pkg-bottom.mk |