From d9f2cc3c85ad86defb62ca707224eddcc3332532 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 2 Jun 2022 23:15:35 +0200 Subject: [PATCH] - replace $(CONFIGURE) w/ $(TARGET_CONFIGURE) --- make/environment-build.mk | 2 -- package/autofs/autofs.mk | 2 +- package/djmount/djmount.mk | 2 +- package/dropbear/dropbear.mk | 2 +- package/e2fsprogs/e2fsprogs.mk | 2 +- package/gettext/gettext.mk | 2 +- package/lcd4linux/lcd4linux.mk | 2 +- package/libmediainfo/libmediainfo.mk | 2 +- package/libzen/libzen.mk | 2 +- package/mediainfo/mediainfo.mk | 2 +- package/minisatip/minisatip.mk | 2 +- package/nano/nano.mk | 2 +- package/samba33/samba33.mk | 2 +- package/samba36/samba36.mk | 2 +- package/streamripper/streamripper.mk | 2 +- 15 files changed, 14 insertions(+), 16 deletions(-) diff --git a/make/environment-build.mk b/make/environment-build.mk index b1f700f9..6cd46f1f 100644 --- a/make/environment-build.mk +++ b/make/environment-build.mk @@ -287,8 +287,6 @@ TARGET_CONFIGURE = \ CONFIG_SITE=/dev/null \ $(TARGET_CONFIGURE_ENV) ./configure $(TARGET_CONFIGURE_OPTS) -CONFIGURE = $(TARGET_CONFIGURE) - # ----------------------------------------------------------------------------- HOST_CMAKE_ENV = \ diff --git a/package/autofs/autofs.mk b/package/autofs/autofs.mk index ac275b7d..e5dd50d1 100644 --- a/package/autofs/autofs.mk +++ b/package/autofs/autofs.mk @@ -57,7 +57,7 @@ autofs: $(AUTOFS_DEPENDENCIES) $(DL_DIR)/$(AUTOFS_SOURCE) | $(TARGET_DIR) $(call APPLY_PATCHES,$($(PKG)_PATCH)) $(CHDIR)/$(PKG_DIR); \ $(SED) "s|nfs/nfs.h|linux/nfs.h|" include/rpc_subs.h; \ - $(CONFIGURE); \ + $(TARGET_CONFIGURE); \ $($(PKG)_MAKE_ENV) \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) diff --git a/package/djmount/djmount.mk b/package/djmount/djmount.mk index 29b6008c..e08b960b 100644 --- a/package/djmount/djmount.mk +++ b/package/djmount/djmount.mk @@ -26,7 +26,7 @@ djmount: $(DJMOUNT_DEPENDENCIES) $(DL_DIR)/$(DJMOUNT_SOURCE) | $(TARGET_DIR) $(call APPLY_PATCHES,$(PKG_PATCHES_DIR)) $(CHDIR)/$(PKG_DIR); \ touch libupnp/config.aux/config.rpath; \ - $(CONFIGURE); \ + $(TARGET_CONFIGURE); \ $(MAKE1); \ $(MAKE1) install DESTDIR=$(TARGET_DIR) $(INSTALL_EXEC) -D $(PKG_FILES_DIR)/djmount.init $(TARGET_sysconfdir)/init.d/djmount diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk index d214297a..36404331 100644 --- a/package/dropbear/dropbear.mk +++ b/package/dropbear/dropbear.mk @@ -33,7 +33,7 @@ DROPBEAR_TARGET_FINALIZE_HOOKS += DROPBEAR_INSTALL_INIT_SCRIPT dropbear: | $(TARGET_DIR) $(call PREPARE) $(CHDIR)/$($(PKG)_DIR); \ - $(CONFIGURE); \ + $(TARGET_CONFIGURE); \ # Ensure that dropbear doesn't use crypt() when it's not available; \ echo '#if !HAVE_CRYPT' >> localoptions.h; \ echo '#define DROPBEAR_SVR_PASSWORD_AUTH 0' >> localoptions.h; \ diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index ed1758d7..80c7c70c 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -60,7 +60,7 @@ E2FSPROGS_TARGET_FINALIZE_HOOKS += E2FSPROGS_TARGET_CLEANUP e2fsprogs: | $(TARGET_DIR) $(call PREPARE) $(CHDIR)/$($(PKG)_DIR); \ - $(CONFIGURE); \ + $(TARGET_CONFIGURE); \ $(MAKE); \ $(MAKE1) install install-libs DESTDIR=$(TARGET_DIR) $(call TARGET_FOLLOWUP) diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk index bfb147d8..1a3e33bb 100644 --- a/package/gettext/gettext.mk +++ b/package/gettext/gettext.mk @@ -30,7 +30,7 @@ gettext: $(DL_DIR)/$(GETTEXT_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(PKG_DIR) $(UNTAR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ - $(CONFIGURE); \ + $(TARGET_CONFIGURE); \ $(MAKE) -C gettext-runtime; \ $(MAKE) -C gettext-runtime install DESTDIR=$(TARGET_DIR) $(REWRITE_LIBTOOL) diff --git a/package/lcd4linux/lcd4linux.mk b/package/lcd4linux/lcd4linux.mk index 09aad523..6880df3e 100644 --- a/package/lcd4linux/lcd4linux.mk +++ b/package/lcd4linux/lcd4linux.mk @@ -34,7 +34,7 @@ lcd4linux: | $(TARGET_DIR) $(call PREPARE) $(CHDIR)/$($(PKG)_DIR); \ ./bootstrap; \ - $(CONFIGURE); \ + $(TARGET_CONFIGURE); \ $(MAKE) vcs_version; \ $(MAKE); \ $(MAKE) install diff --git a/package/libmediainfo/libmediainfo.mk b/package/libmediainfo/libmediainfo.mk index 3fd921a5..0309c495 100644 --- a/package/libmediainfo/libmediainfo.mk +++ b/package/libmediainfo/libmediainfo.mk @@ -20,7 +20,7 @@ libmediainfo: $(LIBMEDIAINFO_DEPENDENCIES) $(DL_DIR)/$(LIBMEDIAINFO_SOURCE) | $( $(REMOVE)/$(PKG_DIR) $(UNTAR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR)/Project/GNU/Library; \ - $(CONFIGURE); \ + $(TARGET_CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_LIBTOOL) diff --git a/package/libzen/libzen.mk b/package/libzen/libzen.mk index fd7490ec..22c73635 100644 --- a/package/libzen/libzen.mk +++ b/package/libzen/libzen.mk @@ -20,7 +20,7 @@ libzen: $(LIBZEN_DEPENDENCIES) $(DL_DIR)/$(LIBZEN_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(PKG_DIR) $(UNTAR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR)/Project/GNU/Library; \ - $(CONFIGURE); \ + $(TARGET_CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_LIBTOOL) diff --git a/package/mediainfo/mediainfo.mk b/package/mediainfo/mediainfo.mk index bea1d51e..4dd47606 100644 --- a/package/mediainfo/mediainfo.mk +++ b/package/mediainfo/mediainfo.mk @@ -20,7 +20,7 @@ mediainfo: $(MEDIAINFO_DEPENDENCIES) $(DL_DIR)/$(MEDIAINFO_SOURCE) | $(TARGET_DI $(REMOVE)/$(MEDIAINFO_DIR) $(UNTAR)/$(MEDIAINFO_SOURCE) $(CHDIR)/$(MEDIAINFO_DIR)/Project/GNU/CLI; \ - $(CONFIGURE); \ + $(TARGET_CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REMOVE)/$(MEDIAINFO_DIR) diff --git a/package/minisatip/minisatip.mk b/package/minisatip/minisatip.mk index 5d46438c..86a7b031 100644 --- a/package/minisatip/minisatip.mk +++ b/package/minisatip/minisatip.mk @@ -40,7 +40,7 @@ MINISATIP_TARGET_FINALIZE_HOOKS += MINISATIP_INSTALL_INIT_SCRIPT minisatip: | $(TARGET_DIR) $(call PREPARE) $(CHDIR)/$($(PKG)_DIR); \ - $(CONFIGURE); \ + $(TARGET_CONFIGURE); \ $(TARGET_CONFIGURE_ENV) \ $(MAKE) $(call TARGET_FOLLOWUP) diff --git a/package/nano/nano.mk b/package/nano/nano.mk index 143b40e6..3dcac47d 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -38,7 +38,7 @@ NANO_TARGET_FINALIZE_HOOKS += NANO_INSTALL_PROFILE_D_SCRIPT nano: | $(TARGET_DIR) $(call PREPARE) $(CHDIR)/$($(PKG)_DIR); \ - $(CONFIGURE); \ + $(TARGET_CONFIGURE); \ $(NANO_MAKE_ENV) $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(call TARGET_FOLLOWUP) diff --git a/package/samba33/samba33.mk b/package/samba33/samba33.mk index 07199537..4416af9b 100644 --- a/package/samba33/samba33.mk +++ b/package/samba33/samba33.mk @@ -58,7 +58,7 @@ samba33: $(SAMBA33_DEPENDENCIES) $(DL_DIR)/$(SAMBA33_SOURCE) | $(TARGET_DIR) $(call APPLY_PATCHES,$(PKG_PATCHES_DIR)) $(CHDIR)/$(PKG_DIR)/source; \ ./autogen.sh; \ - $(CONFIGURE); \ + $(TARGET_CONFIGURE); \ $(MAKE1) all; \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(INSTALL) -d $(TARGET_localstatedir)/samba/locks diff --git a/package/samba36/samba36.mk b/package/samba36/samba36.mk index f6637109..ca61b9c5 100644 --- a/package/samba36/samba36.mk +++ b/package/samba36/samba36.mk @@ -56,7 +56,7 @@ samba36: $(SAMBA36_DEPENDENCIES) $(DL_DIR)/$(SAMBA36_SOURCE) | $(TARGET_DIR) $(call APPLY_PATCHES,$(PKG_PATCHES_DIR)) $(CHDIR)/$(PKG_DIR)/source3; \ ./autogen.sh; \ - $(CONFIGURE); \ + $(TARGET_CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(INSTALL) -d $(TARGET_localstatedir)/samba/locks diff --git a/package/streamripper/streamripper.mk b/package/streamripper/streamripper.mk index e1b21c3d..18782575 100644 --- a/package/streamripper/streamripper.mk +++ b/package/streamripper/streamripper.mk @@ -36,6 +36,6 @@ STREAMRIPPER_TARGET_FINALIZE_HOOKS += STREAMRIPPER_INSTALL_SCRIPT streamripper: | $(TARGET_DIR) $(call PREPARE) $(CHDIR)/$($(PKG)_DIR); \ - $(CONFIGURE); \ + $(TARGET_CONFIGURE); \ $(MAKE) $(call TARGET_FOLLOWUP)