aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Ricardo Martincoski <ricardo.martincoski@gmail.com>2019-01-27 16:59:40 -0200
committerGravatar Peter Korsgaard <peter@korsgaard.com>2019-01-29 23:01:23 +0100
commit8a59efaf6dcd4d092483edc25fe0b4990a510a9b (patch)
tree9a96eb4e31960357f25b4d0c6cd3be7fe029af94
parent88a0590b7085be647d70ac7689acbb5b849718fa (diff)
downloadbuildroot-8a59efaf6dcd4d092483edc25fe0b4990a510a9b.tar.gz
buildroot-8a59efaf6dcd4d092483edc25fe0b4990a510a9b.tar.bz2
package/usb_modeswitch: avoid overriding variables
Overriding variables in packages recipes is an error-prone practice. Current behavior of installing either only as a script or only as a binary is intended, as describe in the commit log of "d3e4db4e34 usb_modeswitch: bump to version 1.2.6" from 2013. Rewrite the code to keep the same behavior while replacing variable override [1] by conditional assignments [2]. [1] VAR = ... if ... VAR = ... [2] if ... VAR = ... else VAR = ... Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com> (cherry picked from commit e25040d31a8d50c3c523f78f43ba1f557269b3bb) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/usb_modeswitch/usb_modeswitch.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/usb_modeswitch/usb_modeswitch.mk b/package/usb_modeswitch/usb_modeswitch.mk
index 389ed1f422..0b7eb171dd 100644
--- a/package/usb_modeswitch/usb_modeswitch.mk
+++ b/package/usb_modeswitch/usb_modeswitch.mk
@@ -13,13 +13,13 @@ USB_MODESWITCH_LICENSE_FILES = COPYING
# Package does not build in parallel due to improper make rules
USB_MODESWITCH_MAKE = $(MAKE1)
-USB_MODESWITCH_BUILD_TARGETS = static
-USB_MODESWITCH_INSTALL_TARGETS = install-static
-
ifeq ($(BR2_PACKAGE_TCL)$(BR2_PACKAGE_TCL_SHLIB_ONLY),y)
USB_MODESWITCH_DEPENDENCIES += tcl
USB_MODESWITCH_BUILD_TARGETS = script
USB_MODESWITCH_INSTALL_TARGETS = install-script
+else
+USB_MODESWITCH_BUILD_TARGETS = static
+USB_MODESWITCH_INSTALL_TARGETS = install-static
endif
# build system of embedded jimtcl doesn't use autotools, but does use