summaryrefslogtreecommitdiffstats
path: root/unix/Makefile.in
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2021-06-25 14:03:55 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2021-06-25 14:03:55 (GMT)
commitce4804bf2c760215562c9ca1c5f76589611050cb (patch)
treef7eae2bd3b367bc716ce851d7e988a3b3b8e14dc /unix/Makefile.in
parent7951ebbd2e2809e4c48986c8bc50b39eb0b2b75a (diff)
parenta6691785d8bdaa339449e8df532a8b11a8690909 (diff)
downloadtcl-ce4804bf2c760215562c9ca1c5f76589611050cb.zip
tcl-ce4804bf2c760215562c9ca1c5f76589611050cb.tar.gz
tcl-ce4804bf2c760215562c9ca1c5f76589611050cb.tar.bz2
Merge 8.7
Diffstat (limited to 'unix/Makefile.in')
-rw-r--r--unix/Makefile.in7
1 files changed, 4 insertions, 3 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in
index dde1aff..d5ba886 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -1524,7 +1524,7 @@ tclZlib.o: $(GENERIC_DIR)/tclZlib.c
$(CC) -c $(CC_SWITCHES) $(ZLIB_INCLUDE) $(GENERIC_DIR)/tclZlib.c
tclZipfs.o: $(GENERIC_DIR)/tclZipfs.c
- $(CC) -c $(CC_SWITCHES) \
+ $(CC) -c $(CC_SWITCHES) -D_GNU_SOURCE \
-DCFG_RUNTIME_DLLFILE="\"$(TCL_LIB_FILE)\"" \
-DCFG_RUNTIME_LIBDIR="\"$(libdir)\"" \
-I$(ZLIB_DIR) -I$(ZLIB_DIR)/contrib/minizip \
@@ -2268,7 +2268,7 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(UNIX_DIR)/tcl.pc.in gen
mkdir $(DISTDIR)/library/$$i;\
cp -p $(TOP_DIR)/library/$$i/*.tcl $(DISTDIR)/library/$$i; \
done
- cp -p $(TOP_DIR)/library/cookiejar/*.txt.gz $(DISTDIR)/library/cookiejar
+ cp -p $(TOP_DIR)/library/cookiejar/*.dat.gz $(DISTDIR)/library/cookiejar
@mkdir $(DISTDIR)/library/encoding
cp -p $(TOP_DIR)/library/encoding/*.enc $(DISTDIR)/library/encoding
@mkdir $(DISTDIR)/library/msgs
@@ -2392,7 +2392,8 @@ html-tk: ${NATIVE_TCLSH}
BUILD_HTML = \
@${NATIVE_TCLSH} $(TOOL_DIR)/tcltk-man2html.tcl \
- --tcl --useversion=$(MAJOR_VERSION).$(MINOR_VERSION) --htmldir="$(HTML_INSTALL_DIR)" \
+ --useversion=$(MAJOR_VERSION).$(MINOR_VERSION) \
+ --htmldir="$(HTML_INSTALL_DIR)" \
--srcdir=$(TOP_DIR) $(BUILD_HTML_FLAGS)
#--------------------------------------------------------------------------