Merge pull request #2841 from dibdot/adblock

[feed/packages.git] / utils / attr / Makefile

diff --git a/utils/attr/Makefile b/utils/attr/Makefile
index 1d3bde28262bcfaf65f4f0ca4bd96289823601c2..dca9deb08a6d35b61c127ed1a925415915746461 100644 (file)
--- a/utils/attr/Makefile
+++ b/utils/attr/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014 OpenWrt.org
+# Copyright (C) 2014-2015 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,8 +8,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=attr
-PKG_REV:=c4a7fdbcc109d6e8b465a427c714926fcb85c750
-PKG_VERSION:=20141020
+PKG_REV:=efa0b1ea982261861d64f6d6d620af83d82b02d3
+PKG_VERSION:=20150922
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -17,12 +17,14 @@ PKG_SOURCE_URL:=git://git.sv.gnu.org/attr.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
-PKG_INSTALL:=1
+
 PKG_LICENSE:=LGPL-2.1 GPL-2.0
 PKG_LICENSE_FILES:=doc/COPYING doc/COPYING.LGPL
 
+PKG_INSTALL:=1
+PKG_FIXUP:=autoreconf
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/attr/Default
@@ -65,11 +67,6 @@ endef
 
 CONFIGURE_ARGS += --enable-static --enable-shared
 
-define Build/Prepare
-       $(call Build/Prepare/Default)
-       (cd $(PKG_BUILD_DIR); ./autogen.sh;);
-endef
-
 define Package/attr/install
        $(INSTALL_DIR) $(1)/usr/bin
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
@@ -89,7 +86,7 @@ endef
 define Build/InstallDev
        mkdir -p $(1)/usr/include
        mkdir -p $(1)/usr/lib/pkgconfig
-       $(CP) -r $(PKG_INSTALL_DIR)/usr/{include,lib} $(1)/usr/
+       $(CP) $(PKG_INSTALL_DIR)/usr/{include,lib} $(1)/usr/
 endef
 
 $(eval $(call BuildPackage,attr))