remove ref to EXTRA_*FLAGS, convert description, cleanup

[openwrt/svn-archive/archive.git] / utils / procps / Makefile

diff --git a/utils/procps/Makefile b/utils/procps/Makefile
index 91bcb1a09bc27c9047ca2f37bf111e1c4802e3ad..83ea3d8f5f6f3d2ee7aa932399880adb992b1aa6 100644 (file)
--- a/utils/procps/Makefile
+++ b/utils/procps/Makefile
@@ -15,12 +15,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://procps.sourceforge.net
 PKG_MD5SUM:=f490bca772b16472962c7b9f23b1e97d
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
-PKG_BUILDDEP:=libncurses
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -29,26 +23,23 @@ define Package/procps
   CATEGORY:=Utilities
   DEPENDS:=+libncurses
   TITLE:=proc utilities
-  DESCRIPTION:=\
-       procps is the package that has a bunch of small useful\\\
-       utilities that give information about processes using\\\
-       the /proc filesystem. The package includes the programs\\\
-       ps, top, vmstat, w, kill, free, slabtop, and skill.
   URL:=http://sourceforge.net/projects/procps/
 endef
 
-define Build/Configure
+define Package/procps/description
+ procps is the package that has a bunch of small useful utilities that give 
+ information about processes using the /proc filesystem. The package 
+ includes the programs ps, top, vmstat, w, kill, free, slabtop, and skill.
 endef
 
-define Build/Compile
-       $(call Build/Compile/Default, \
-               CFLAGS="\$$$$(EXTRA_CFLAGS)" \
-               LDFLAGS="\$$$$(EXTRA_LDFLAGS)" \
-       )
-endef
+MAKE_FLAGS += \
+       CFLAGS="$(TARGET_CFLAGS)" \
+       CPPFLAGS="$(TARGET_CPPFLAGS)" \
+       LDFLAGS="$(TARGET_LDFLAGS)" \
 
 define Package/procps/install
        $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/free $(1)/usr/bin/
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/ps/ps $(1)/usr/bin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/pgrep $(1)/usr/bin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/pkill $(1)/usr/bin
@@ -58,9 +49,12 @@ define Package/procps/install
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/slabtop $(1)/usr/bin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/snice $(1)/usr/bin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/tload $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/top $(1)/usr/bin/
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/vmstat $(1)/usr/bin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/w $(1)/usr/bin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/watch $(1)/usr/bin
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/proc/libproc-$(PKG_VERSION).so $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,procps))