tcl: add _VERSION_MAJOR / _VERSION_MINOR and use instead of hardcoded 8.4

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/package/sqlcipher/sqlcipher.mk b/package/sqlcipher/sqlcipher.mk
index 9ad3e555abd8c1d7ad9a7f93f46e6b5945882c97..3e69a962bd889a5225c9622e16f6802059dafcf8 100644 (file)
--- a/package/sqlcipher/sqlcipher.mk
+++ b/package/sqlcipher/sqlcipher.mk
@@ -12,7 +12,7 @@ SQLCIPHER_INSTALL_STAGING = YES
 SQLCIPHER_CONF_ENV = \
        CFLAGS+=" $(SQLCIPHER_CFLAGS)" \
        LDFLAGS+=" $(SQLCIPHER_LDFLAGS)" \
-       TCLSH_CMD=$(HOST_DIR)/usr/bin/tclsh8.4
+       TCLSH_CMD=$(HOST_DIR)/usr/bin/tclsh$(TCL_VERSION_MAJOR)
 
 SQLCIPHER_CONF_OPT = \
        --enable-threadsafe \

diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk
index 7bde8c7134eb7490e8789a7482635e70759ee1be..8ed81ab37d2f9fb3157aacefca4bae91b59a6195 100644 (file)
--- a/package/tcl/tcl.mk
+++ b/package/tcl/tcl.mk
@@ -3,7 +3,9 @@
 # TCL8.4
 #
 #############################################################
-TCL_VERSION = 8.4.19
+TCL_VERSION_MAJOR = 8.4
+TCL_VERSION_MINOR = 19
+TCL_VERSION = $(TCL_VERSION_MAJOR).$(TCL_VERSION_MINOR)
 TCL_SOURCE = tcl$(TCL_VERSION)-src.tar.gz
 TCL_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/tcl
 TCL_SUBDIR = unix
@@ -20,10 +22,10 @@ HOST_TCL_CONF_OPT = \
 define TCL_POST_INSTALL_CLEANUP
        -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libtcl8.4.so
        -if [ "$(BR2_PACKAGE_TCL_DEL_ENCODINGS)" = "y" ]; then \
-       rm -Rf $(TARGET_DIR)/usr/lib/tcl8.4/encoding/*; \
+       rm -Rf $(TARGET_DIR)/usr/lib/tcl$(TCL_VERSION_MAJOR)/encoding/*; \
        fi
        -if [ "$(BR2_PACKAGE_TCL_SHLIB_ONLY)" = "y" ]; then \
-       rm -f $(TARGET_DIR)/usr/bin/tclsh8.4; \
+       rm -f $(TARGET_DIR)/usr/bin/tclsh$(TCL_VERSION_MAJOR); \
        fi
 endef