aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-05-13 12:20:15 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-05-13 12:20:15 +0000
commitb15e49f2fa7502b7767c6b07c1ae9791c97c4c80 (patch)
treeabdaa46592bdda0f37db2ecd6408b02bec0fbddf
parent60d3ffb49a4854b546c7899384faa0b3d5f3e402 (diff)
downloadupstream-b15e49f2fa7502b7767c6b07c1ae9791c97c4c80.tar.gz
upstream-b15e49f2fa7502b7767c6b07c1ae9791c97c4c80.tar.bz2
upstream-b15e49f2fa7502b7767c6b07c1ae9791c97c4c80.zip
package/util-linux: install development files
Also remove trailing whitespaces from the Makefile. Based on a patch by M. Braun. SVN-Revision: 31701
-rw-r--r--package/util-linux/Makefile28
1 files changed, 26 insertions, 2 deletions
diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index aa45dd0622..40d15799a8 100644
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -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
@@ -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
@@ -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