grep: set PKG_SUBDIRS instead of patching Makefile.in

Set PKG_SUBDIRS in the package Makefile instead of patching Makefile.in
to exclude doc, tests, and gnulib-tests.

Signed-off-by: Wei-Ting Yang <redacted>

diff --git a/utils/grep/Makefile b/utils/grep/Makefile
index 712493ae73036cc9026a2726e603b8e316e1ec0a..7860b897ef553a2e88eb2fe778cbba26b8e0a94a 100644 (file)
--- a/utils/grep/Makefile
+++ b/utils/grep/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=grep
 PKG_VERSION:=3.12
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/grep
@@ -22,6 +22,7 @@ PKG_CPE_ID:=cpe:/a:gnu:grep
 
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
+PKG_SUBDIRS:=po lib src
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/utils/grep/patches/902-skip-doc-tests-gnulib-tests.patch b/utils/grep/patches/902-skip-doc-tests-gnulib-tests.patch
deleted file mode 100644 (file)
index 73b44c5..0000000
--- a/utils/grep/patches/902-skip-doc-tests-gnulib-tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -2399,7 +2399,7 @@ top_srcdir = @top_srcdir@
- # along with this program.  If not, see <https://www.gnu.org/licenses/>.
- #
- AUTOMAKE_OPTIONS = gnu 1.12
--SUBDIRS = po lib doc src tests gnulib-tests
-+SUBDIRS = po lib src
- EXTRA_DIST = \
-   .mailmap            \
-   ChangeLog-2009      \