Skip to content

Commit

Permalink
package/util-linux: install development files
Browse files Browse the repository at this point in the history
Also remove trailing whitespaces from the Makefile.

Based on a patch by M. Braun.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31701 3c298f89-4303-0410-b956-a3cf2f4a3e73
  • Loading branch information
juhosg committed May 13, 2012
1 parent 501390d commit d9d36ef
Showing 1 changed file with 26 additions and 2 deletions.
28 changes: 26 additions & 2 deletions package/util-linux/Makefile
Expand Up @@ -36,6 +36,30 @@ CONFIGURE_ARGS += \
--disable-nls \
--disable-tls

define Build/InstallDev
$(MAKE) -C $(PKG_BUILD_DIR) \
BUILDCC="$(HOSTCC)" \
DESTDIR="$(1)" \
installdirs install-data

$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
$(CP) $(PKG_BUILD_DIR)/libblkid/blkid.pc $(1)/usr/lib/pkgconfig
$(CP) $(PKG_BUILD_DIR)/libmount/mount.pc $(1)/usr/lib/pkgconfig
$(CP) $(PKG_BUILD_DIR)/libuuid/uuid.pc $(1)/usr/lib/pkgconfig

$(INSTALL_DIR) $(1)/usr/include/blkid
$(CP) $(PKG_BUILD_DIR)/libblkid/src/blkid.h $(1)/usr/include/blkid
$(INSTALL_DIR) $(1)/usr/include/libmount
$(CP) $(PKG_BUILD_DIR)/libmount/src/libmount.h $(1)/usr/include/libmount
$(INSTALL_DIR) $(1)/usr/include/uuid
$(CP) $(PKG_BUILD_DIR)/libuuid/src/uuid.h $(1)/usr/include/uuid

$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_BUILD_DIR)/libblkid/src/.libs/libblkid.{a,so.*} $(1)/usr/lib
$(CP) $(PKG_BUILD_DIR)/libmount/src/.libs/libmount.{a,so.*} $(1)/usr/lib
$(CP) $(PKG_BUILD_DIR)/libuuid/src/.libs/libuuid.{a,so.*} $(1)/usr/lib
endef

define Package/libblkid
$(call Package/util-linux/Default)
TITLE:=block device id library
Expand Down Expand Up @@ -90,7 +114,7 @@ endef
define Package/blkid
$(call Package/util-linux/Default)
TITLE:=locate/print block device attributes
DEPENDS:= +libblkid +libuuid
DEPENDS:= +libblkid +libuuid
SUBMENU=disc
endef

Expand Down Expand Up @@ -262,7 +286,7 @@ endef
define Package/partx-utils
$(call Package/util-linux/Default)
TITLE:=inform kernel about the presence and numbering of on-disk partitions
DEPENDS:= +libblkid +libuuid
DEPENDS:= +libblkid +libuuid
SUBMENU=disc
endef

Expand Down

0 comments on commit d9d36ef

Please sign in to comment.