version.mk: explicitely filter "generic" subtarget for "%s" placeholder (#18710)

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
SVN-Revision: 43905

diff --git a/include/version.mk b/include/version.mk
index d4addd608f830503b5b3ac61205ba957d6c3fc7c..5d191cc8aace11fb7baeea6b7f23409f585d8324 100644 (file)
--- a/include/version.mk
+++ b/include/version.mk
@@ -79,7 +79,7 @@ VERSION_SED:=$(SED) 's,%U,$(VERSION_REPO),g' \
        -e 's,%R,$(REVISION),g' \
        -e 's,%T,$(BOARD),g' \
        -e 's,%S,$(BOARD)/$(if $(SUBTARGET),$(SUBTARGET),generic),g' \
-       -e 's,%s,$(BOARD)$(if $(SUBTARGET),.$(SUBTARGET)),g' \
+       -e 's,%s,$(BOARD)$(if $(filter-out generic,$(SUBTARGET)),.$(SUBTARGET)),g' \
        -e 's,%t,$(VERSION_TAINTS),g' \
        -e 's,%M,$(VERSION_MANUFACTURER),g' \
        -e 's,%P,$(VERSION_PRODUCT),g' \