[Buildroot] [git commit] infra: remove separate definition of DISABLE_DOCUMENTATION

Peter Korsgaard peter at korsgaard.com
Sat Feb 8 22:44:48 UTC 2014


commit: http://git.buildroot.net/buildroot/commit/?id=e20df632c4cd717061ae8176a5c34181c671baee
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master

Since we now always disable documentation on target, there is no need to
have a separate variable DISABLE_DOCUMENTATION anymore.

Suggested-by: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire at gmail.com>
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
---
 package/Makefile.in      |   10 ----------
 package/pkg-autotools.mk |    7 ++++++-
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/package/Makefile.in b/package/Makefile.in
index a8f5650..9d0e7d6 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -332,16 +332,6 @@ ifneq ($(BR2_LARGEFILE),y)
 DISABLE_LARGEFILE= --disable-largefile
 endif
 
-# The configure option varies, but since unknown options are ignored
-# we can pass all of them.
-DISABLE_DOCUMENTATION = \
-	--disable-gtk-doc \
-	--disable-doc \
-	--disable-docs \
-	--disable-documentation \
-	--with-xmlto=no \
-	--with-fop=no
-
 ifeq ($(BR2_INET_IPV6),y)
 DISABLE_IPV6= --enable-ipv6
 else
diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
index cfbdc27..6f52335 100644
--- a/package/pkg-autotools.mk
+++ b/package/pkg-autotools.mk
@@ -109,7 +109,12 @@ define $(2)_CONFIGURE_CMDS
 		--exec-prefix=/usr \
 		--sysconfdir=/etc \
 		--program-prefix="" \
-		$$(DISABLE_DOCUMENTATION) \
+		--disable-gtk-doc \
+		--disable-doc \
+		--disable-docs \
+		--disable-documentation \
+		--with-xmlto=no \
+		--with-fop=no
 		$$(DISABLE_NLS) \
 		$$(DISABLE_LARGEFILE) \
 		$$(DISABLE_IPV6) \


More information about the buildroot mailing list