diff options
| -rw-r--r-- | docs/manual/adding-packages-autotools.txt | 2 | ||||
| -rw-r--r-- | package/gstreamer/gst-plugin-x170/gst-plugin-x170.mk | 2 | ||||
| -rw-r--r-- | package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 | ||||
| -rw-r--r-- | package/pkg-autotools.mk | 4 | ||||
| -rw-r--r-- | package/webkit/webkit.mk | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/docs/manual/adding-packages-autotools.txt b/docs/manual/adding-packages-autotools.txt index d04e023e97..526b216581 100644 --- a/docs/manual/adding-packages-autotools.txt +++ b/docs/manual/adding-packages-autotools.txt @@ -126,7 +126,7 @@ cases, typical packages will therefore only use a few of them. +LIBFOO_AUTORECONF=YES+. These are passed in the environment of the 'autoreconf' command. By default, empty. -* +LIBFOO_AUTORECONF_OPT+ to specify additional options +* +LIBFOO_AUTORECONF_OPTS+ to specify additional options passed to the 'autoreconf' program if +LIBFOO_AUTORECONF=YES+. By default, empty. diff --git a/package/gstreamer/gst-plugin-x170/gst-plugin-x170.mk b/package/gstreamer/gst-plugin-x170/gst-plugin-x170.mk index 29929bcd2b..378cd7a817 100644 --- a/package/gstreamer/gst-plugin-x170/gst-plugin-x170.mk +++ b/package/gstreamer/gst-plugin-x170/gst-plugin-x170.mk @@ -12,7 +12,7 @@ GST_PLUGIN_X170_LICENSE = BSD-1c # There is no generated configure script in the tarball. GST_PLUGIN_X170_AUTORECONF = YES -GST_PLUGIN_X170_AUTORECONF_OPT = -Im4/ +GST_PLUGIN_X170_AUTORECONF_OPTS = -Im4/ GST_PLUGIN_X170_DEPENDENCIES = gstreamer libglib2 on2-8170-libs $(eval $(autotools-package)) diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index 63167bccac..d89c3961b3 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -13,7 +13,7 @@ GST1_PLUGINS_BAD_LICENSE_FILES = COPYING COPYING.LIB GST1_PLUGINS_BAD_LICENSE = LGPLv2+ LGPLv2.1+ GST1_PLUGINS_BAD_AUTORECONF = YES -GST1_PLUGINS_BAD_AUTORECONF_OPT = -I $(@D)/common/m4 +GST1_PLUGINS_BAD_AUTORECONF_OPTS = -I $(@D)/common/m4 GST1_PLUGINS_BAD_GETTEXTIZE = YES GST1_PLUGINS_BAD_CONF_OPT = \ diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index 42ba138eba..1b40aaf8ba 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -100,7 +100,7 @@ ifeq ($(4),host) endif ifeq ($(4),host) - $(2)_AUTORECONF_OPT ?= $$($(3)_AUTORECONF_OPT) + $(2)_AUTORECONF_OPTS ?= $$($(3)_AUTORECONF_OPTS) endif $(2)_CONF_ENV ?= @@ -228,7 +228,7 @@ endef # define AUTORECONF_HOOK @$$(call MESSAGE,"Autoreconfiguring") - $$(Q)cd $$($$(PKG)_SRCDIR) && $$($$(PKG)_AUTORECONF_ENV) $$(AUTORECONF) $$($$(PKG)_AUTORECONF_OPT) + $$(Q)cd $$($$(PKG)_SRCDIR) && $$($$(PKG)_AUTORECONF_ENV) $$(AUTORECONF) $$($$(PKG)_AUTORECONF_OPTS) $$(Q)if test "$$($$(PKG)_LIBTOOL_PATCH)" = "YES"; then \ for i in `find $$($$(PKG)_SRCDIR) -name ltmain.sh`; do \ ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$$$i | \ diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk index f07c927bf2..d15afb1f0e 100644 --- a/package/webkit/webkit.mk +++ b/package/webkit/webkit.mk @@ -17,7 +17,7 @@ WEBKIT_DEPENDENCIES += \ # webkit-disable-tests.patch changes configure.ac therefore autoreconf required WEBKIT_AUTORECONF = YES -WEBKIT_AUTORECONF_OPT = -I $(@D)/Source/autotools +WEBKIT_AUTORECONF_OPTS = -I $(@D)/Source/autotools # parallel make install deadlocks with make 3.81 WEBKIT_INSTALL_STAGING_OPTS = -j1 DESTDIR=$(STAGING_DIR) install |
