From 3e34d38b2d69b07bcdaf25c2935b750d829b4afb Mon Sep 17 00:00:00 2001 From: apnadkarni Date: Tue, 5 Dec 2017 14:29:47 +0000 Subject: Use PRJ_PACKAGE_TCLNAME instead of PROJECT when generating TEA based pkgindex --- win/rules.vc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/win/rules.vc b/win/rules.vc index af39a94..9b917b6 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -1266,8 +1266,10 @@ COMPILERFLAGS = $(COMPILERFLAGS) /DUNICODE /D_UNICODE !endif # Like the TEA system only set this non empty for non-Tk extensions +# Note: some extensions use PACKAGE_NAME and others use PACKAGE_TCLNAME +# so we pass both !if !$(DOING_TCL) && !$(DOING_TK) -PKGNAMEFLAGS = -DPACKAGE_NAME="\"$(PROJECT)\"" \ +PKGNAMEFLAGS = -DPACKAGE_NAME="\"$(PRJ_PACKAGE_TCLNAME)\"" \ -DPACKAGE_TCLNAME="\"$(PRJ_PACKAGE_TCLNAME)\"" \ -DPACKAGE_VERSION="\"$(DOTVERSION)\"" \ -DMODULE_SCOPE=extern @@ -1459,7 +1461,7 @@ default-pkgindex: default-pkgindex-tea: @if exist $(ROOT)\pkgIndex.tcl.in nmakehlp -s << $(ROOT)\pkgIndex.tcl.in > $(OUT_DIR)\pkgIndex.tcl @PACKAGE_VERSION@ $(DOTVERSION) -@PACKAGE_NAME@ $(PROJECT) +@PACKAGE_NAME@ $(PRJ_PACKAGE_TCLNAME) @PACKAGE_TCLNAME@ $(PRJ_PACKAGE_TCLNAME) @PKG_LIB_FILE@ $(PRJLIBNAME) << -- cgit v0.12