From e20df632c4cd717061ae8176a5c34181c671baee Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Wed, 5 Feb 2014 14:51:00 +0100 Subject: [PATCH] infra: remove separate definition of DISABLE_DOCUMENTATION Since we now always disable documentation on target, there is no need to have a separate variable DISABLE_DOCUMENTATION anymore. Suggested-by: Thomas Petazzoni Signed-off-by: Thomas De Schampheleire Signed-off-by: Peter Korsgaard --- 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 a8f5650277..9d0e7d60ed 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 cfbdc27161..6f523353bb 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) \ -- 2.30.2