diff options
| author | apnadkarni <apnmbx-wits@yahoo.com> | 2017-12-05 14:29:47 (GMT) |
|---|---|---|
| committer | apnadkarni <apnmbx-wits@yahoo.com> | 2017-12-05 14:29:47 (GMT) |
| commit | 3e34d38b2d69b07bcdaf25c2935b750d829b4afb (patch) | |
| tree | c57d8ddeb7f031a8c1e0ebfef2e89a6a3d03614f | |
| parent | 335305de9cd5835ff41ab2b95ca46360fe7257fc (diff) | |
| download | tcl-3e34d38b2d69b07bcdaf25c2935b750d829b4afb.zip tcl-3e34d38b2d69b07bcdaf25c2935b750d829b4afb.tar.gz tcl-3e34d38b2d69b07bcdaf25c2935b750d829b4afb.tar.bz2 | |
Use PRJ_PACKAGE_TCLNAME instead of PROJECT when generating TEA based pkgindex
| -rw-r--r-- | win/rules.vc | 6 |
1 files 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)
<<
|