X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/ac6f244578bcacf957fcdb19212ff2da5b4211c0..a4742fd304e198913fd10256e87934435e44fc45:/include/autotools.mk?ds=sidebyside diff --git a/include/autotools.mk b/include/autotools.mk index 4d98a7cd0..5e1c1053e 100644 --- a/include/autotools.mk +++ b/include/autotools.mk @@ -21,7 +21,8 @@ AM_TOOL_PATHS:= \ ACLOCAL=$(STAGING_DIR_HOST)/bin/aclocal \ AUTOHEADER=$(STAGING_DIR_HOST)/bin/autoheader \ LIBTOOLIZE=$(STAGING_DIR_HOST)/bin/libtoolize \ - M4=$(STAGING_DIR_HOST)/bin/m4 + M4=$(STAGING_DIR_HOST)/bin/m4 \ + AUTOPOINT=true # 1: build dir # 2: remove files @@ -35,10 +36,11 @@ define autoreconf if [ -f $(p)/configure.ac ] || [ -f $(p)/configure.in ]; then \ [ -f $(p)/aclocal.m4 ] && [ ! -f $(p)/acinclude.m4 ] && mv aclocal.m4 acinclude.m4; \ [ -d $(p)/autom4te.cache ] && rm -rf autom4te.cache; \ + touch NEWS AUTHORS COPYING ChangeLog; \ $(AM_TOOL_PATHS) $(STAGING_DIR_HOST)/bin/autoreconf -v -f -i -s \ -B $(STAGING_DIR_HOST)/share/aclocal \ $(patsubst %,-B %,$(5)) \ - $(patsubst %,-I %,$(4)) $(4) || true; \ + $(patsubst %,-I %,$(4)) -I m4 $(4) || true; \ fi; \ ) \ ); @@ -91,14 +93,12 @@ define autoreconf_host endef ifneq ($(filter libtool,$(HOST_FIXUP)),) - HOST_BUILD_DEPENDS += libtool ifeq ($(filter no-autoreconf,$(HOST_FIXUP)),) Hooks/HostConfigure/Pre += autoreconf_host endif endif ifneq ($(filter libtool-ucxx,$(HOST_FIXUP)),) - HOST_BUILD_DEPENDS += libtool ifeq ($(filter no-autoreconf,$(HOST_FIXUP)),) Hooks/HostConfigure/Pre += autoreconf_host endif