summaryrefslogtreecommitdiff
path: root/package/dbus/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'package/dbus/Makefile')
-rw-r--r--package/dbus/Makefile19
1 files changed, 5 insertions, 14 deletions
diff --git a/package/dbus/Makefile b/package/dbus/Makefile
index de0ed663c..7f7f5707f 100644
--- a/package/dbus/Makefile
+++ b/package/dbus/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= dbus
PKG_VERSION:= 1.6.12
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= a70edc50524f258eaf5c9a9994ed8748
PKG_DESCR:= DBUS library and daemon
PKG_SECTION:= libs
@@ -13,19 +13,15 @@ PKG_DEPENDS:= libexpat libx11 libuuid
PKG_BUILDDEP:= expat libX11 util-linux
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
+PKG_OPTS:= dev
ifeq ($(ADK_STATIC),y)
-PKG_OPTS:= libonly
+PKG_OPTS+= libonly
endif
include ${TOPDIR}/mk/package.mk
$(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}))
TARGET_LDFLAGS+= -luuid
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
@@ -56,15 +52,10 @@ dbus-install:
${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-uuidgen ${IDIR_DBUS}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-send ${IDIR_DBUS}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-monitor ${IDIR_DBUS}/usr/bin
-
-dbus-dev-install:
- ${INSTALL_DIR} ${IDIR_DBUS_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_DBUS_DEV}/usr/include
+ # workaround for dev subpackage
${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