From: Nicolas Thill <nico@openwrt.org>
Date: Mon, 19 Apr 2010 15:49:38 +0000 (+0000)
Subject: ink: update to 0.5.1
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6a7e7a6f73a2f3c38c20f0d13abe31f315136894;p=openwrt%2Fsvn-archive%2Fpackages.git

ink: update to 0.5.1

SVN-Revision: 21034
---

diff --git a/utils/ink/Makefile b/utils/ink/Makefile
index 6cde14a9a..cc617b71c 100644
--- a/utils/ink/Makefile
+++ b/utils/ink/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009 OpenWrt.org
+# Copyright (C) 2009-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -7,11 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ink
-PKG_VERSION:=0.5.0
+PKG_VERSION:=0.5.1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/ink
-PKG_MD5SUM:=ddbbc4164384fc7185bc07b7602e4a8d
+PKG_MD5SUM:=df09c4a1a404dd37ffff80ce2491ab6d
+
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -19,26 +21,13 @@ define Package/ink
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=A utility for reading ink levels
-  DEPENDS:=+libinklevel
   URL:=http://ink.sourceforge.net/
-endef
-
-TARGET_CFLAGS += -linklevel
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC="$(TARGET_CC)" \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		CPPFLAGS="$(TARGET_CPPFLAGS)" \
-		LDFLAGS="$(TARGET_LDFLAGS)" \
-		LIBS="$(TARGET_LIBS)" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
+  DEPENDS:=+libinklevel
 endef
 
 define Package/ink/install
-	$(INSTALL_DIR) $(1)/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/local/bin/ink $(1)/bin/
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/ink $(1)/usr/bin/
 endef
 
 $(eval $(call BuildPackage,ink))