Browse Source

autoconf: don't rely on STAGING_DIR_HOST

We can just set M4 in the configure command instead of fixing up the paths
using sed afterwards. This makes the build more robust (and we're currently
preparing a change of the host staging dirs in LEDE that might break this
otherwise).

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
lilik-openwrt-22.03
Matthias Schiffer 8 years ago
parent
commit
9e170ba2c0
No known key found for this signature in database GPG Key ID: 16EF3F64CB201D9C
1 changed files with 2 additions and 1 deletions
  1. +2
    -1
      devel/autoconf/Makefile

+ 2
- 1
devel/autoconf/Makefile View File

@ -21,6 +21,8 @@ PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
CONFIGURE_VARS += M4=m4
define Package/autoconf define Package/autoconf
SECTION:=devel SECTION:=devel
CATEGORY:=Development CATEGORY:=Development
@ -42,7 +44,6 @@ endef
define Package/autoconf/install define Package/autoconf/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(SED) 's|$(STAGING_DIR_HOST)|/usr|g' $(PKG_INSTALL_DIR)/usr/bin/autom4te
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
$(INSTALL_DIR) $(1)/usr/share/autoconf $(INSTALL_DIR) $(1)/usr/share/autoconf
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/autoconf/INSTALL \ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/autoconf/INSTALL \


Loading…
Cancel
Save