- replace $(CONFIGURE) w/ $(TARGET_CONFIGURE)

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 = \

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)

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

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; \

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)

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)

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

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)

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)

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)

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)

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)

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

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

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)