From: Nicolas Thill <nico@openwrt.org>
Date: Fri, 18 Dec 2009 19:27:29 +0000 (+0000)
Subject: [packages] sysfsutils: don't blindly copy intermediate libtool files, use 'make insta... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f004ddcd54538cca48005c9341b93931e0f22bd8;p=openwrt%2Fsvn-archive%2Farchive.git

[packages] sysfsutils: don't blindly copy intermediate libtool files, use 'make install'! (closes: #6221)


SVN-Revision: 18839
---

diff --git a/utils/sysfsutils/Makefile b/utils/sysfsutils/Makefile
index f892b0ebbf..f9a52fe7a4 100644
--- a/utils/sysfsutils/Makefile
+++ b/utils/sysfsutils/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -34,21 +34,22 @@ define Build/Compile
 	$(MAKE) -C "$(PKG_BUILD_DIR)" \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
-		all
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		all install
 endef
 
 define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/sysfs
-	$(CP) $(PKG_BUILD_DIR)/include/*.h $(1)/usr/include/sysfs
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/sysfs $(1)/usr/include/
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/.libs/libsysfs.{a,so*} $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsysfs.{a,so*} $(1)/usr/lib/
 endef
 
 define Package/sysfsutils/install
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_BUILD_DIR)/cmd/systool $(1)/usr/bin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/systool $(1)/usr/bin/
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/.libs/libsysfs.so.* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsysfs.so.* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,sysfsutils))