Browse Source

add/fix devel subpackage, add gconfd to package

Waldemar Brodkorb 13 years ago
parent
commit
6bc42740db
3 changed files with 29 additions and 1 deletions
  1. 10 1
      package/gconf/Makefile
  2. 3 0
      package/libIDL/Makefile
  3. 16 0
      package/orbit2/Makefile

+ 10 - 1
package/gconf/Makefile

@@ -10,7 +10,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		de83e70453910ac62f9ee2a86444bdab
 PKG_DESCR:=		a system for storing application preferences
 PKG_SECTION:=		libs
-PKG_BUILDDEP:=		dbus dbus-glib
+PKG_BUILDDEP:=		dbus dbus-glib orbit2
 PKG_DEPENDS:=		dbus dbus-glib
 PKG_URL:=		http://projects.gnome.org/gconf/
 PKG_SITES:=		ftp://ftp.gnome.org//pub/GNOME/sources/GConf/${PKG_EXTRAVER}/
@@ -25,5 +25,14 @@ gconf-install:
 	$(INSTALL_DIR) $(IDIR_GCONF)/usr/lib
 	$(INSTALL_BIN) $(WRKINST)/usr/lib/libgconf*.so* \
 		$(IDIR_GCONF)/usr/lib
+	$(INSTALL_DIR) $(IDIR_GCONF)/usr/lib/GConf/2
+	$(CP) $(WRKINST)/usr/lib/GConf/2/*.so \
+		$(IDIR_GCONF)/usr/lib/GConf/2
+	$(INSTALL_DIR) $(IDIR_GCONF)/usr/libexec
+	$(INSTALL_BIN) $(WRKINST)/usr/libexec/gconfd-2 \
+		$(IDIR_GCONF)/usr/libexec
+	$(INSTALL_DIR) $(IDIR_GCONF)/usr/share/dbus-1/services
+	$(CP) $(WRKINST)/usr/share/dbus-1/services/* \
+		$(IDIR_GCONF)/usr/share/dbus-1/services
 
 include ${TOPDIR}/mk/pkg-bottom.mk

+ 3 - 0
package/libIDL/Makefile

@@ -29,6 +29,9 @@ libidl-install:
 		$(IDIR_LIBIDL)/usr/lib
 
 libidl-dev-install:
+	$(INSTALL_DIR) $(IDIR_LIBIDL_DEV)/usr/include
+	$(CP) $(WRKINST)/usr/include/* \
+		$(IDIR_LIBIDL_DEV)/usr/include
 	$(INSTALL_DIR) $(IDIR_LIBIDL_DEV)/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/libIDL-config-2 \
 		$(IDIR_LIBIDL_DEV)/usr/bin

+ 16 - 0
package/orbit2/Makefile

@@ -14,9 +14,14 @@ PKG_BUILDDEP:=		libIDL
 PKG_URL:=		http://projects.gnome.org/ORBit2/
 PKG_SITES:=		ftp://ftp.gnome.org//pub/gnome/sources/ORBit2/${PKG_EXTRAVER}/
 
+PKG_SUBPKGS:=		ORBIT2 ORBIT2_DEV
+PKGSD_ORBIT2_DEV:=	orbit2 headers
+PKGSC_ORBIT2_DEV:=	devel
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,ORBIT2,orbit2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ORBIT2_DEV,orbit2-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ORBIT2_DEV},${PKGSC_ORBIT2_DEV}))
 
 CFLAGS_FOR_BUILD+=	$(shell ${BUILD_LIBIDL_CONFIG} --cflags)
 LDFLAGS_FOR_BUILD+=	$(shell ${BUILD_LIBIDL_CONFIG} --libs)
@@ -38,8 +43,19 @@ orbit2-install:
 	$(INSTALL_DIR) $(IDIR_ORBIT2)/usr/lib
 	$(INSTALL_BIN) $(WRKINST)/usr/lib/libORBit*.so* \
 		$(IDIR_ORBIT2)/usr/lib
+	$(INSTALL_DIR) $(IDIR_ORBIT2)/usr/bin
+	$(CP) $(WRKINST)/usr/bin/orbit-idl-2 \
+		$(IDIR_ORBIT2)/usr/bin
 	$(INSTALL_DIR) $(STAGING_DIR)/usr/bin
 	$(CP) $(WRKINST)/usr/bin/orbit-idl-2 \
 		$(STAGING_DIR)/usr/bin
 
+orbit2-dev-install:
+	$(INSTALL_DIR) $(IDIR_ORBIT2_DEV)/usr/include
+	$(CP) $(WRKINST)/usr/include/* \
+		$(IDIR_ORBIT2_DEV)/usr/include
+	$(INSTALL_DIR) $(IDIR_ORBIT2_DEV)/usr/lib/pkgconfig
+	$(CP) $(WRKINST)/usr/lib/pkgconfig/*.pc \
+		$(IDIR_ORBIT2_DEV)/usr/lib/pkgconfig
+
 include ${TOPDIR}/mk/pkg-bottom.mk