summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2021-11-24 12:22:08 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2021-11-24 12:22:08 (GMT)
commitc65fe541cc2c408ec080a298a3eed3c752a5975c (patch)
tree9dd56ef4ec11e8cebc036c50825119a613a34450 /unix
parentbb2edf53775d20639bf171c51667cea8e21cfcea (diff)
parenta4251af984f53f9ff453b5af612327f3c74bfdfc (diff)
downloadtcl-c65fe541cc2c408ec080a298a3eed3c752a5975c.zip
tcl-c65fe541cc2c408ec080a298a3eed3c752a5975c.tar.gz
tcl-c65fe541cc2c408ec080a298a3eed3c752a5975c.tar.bz2
Merge 8.6
Diffstat (limited to 'unix')
-rw-r--r--unix/Makefile.in9
1 files changed, 7 insertions, 2 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 40b9c5a..6f2ea52 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -1257,6 +1257,11 @@ tclAsync.o: $(GENERIC_DIR)/tclAsync.c
tclBasic.o: $(GENERIC_DIR)/tclBasic.c $(COMPILEHDR) $(MATHHDRS) $(NREHDR)
$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclBasic.c
+tclUuid.h: $(TOP_DIR)/manifest.uuid
+ echo "#define TCL_VERSION_UUID \\" >$@
+ cat $(TOP_DIR)/manifest.uuid >>$@
+ echo "" >>$@
+
tclBinary.o: $(GENERIC_DIR)/tclBinary.c
$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclBinary.c
@@ -2226,8 +2231,8 @@ $(UNIX_DIR)/tclConfig.h.in: $(MAC_OSX_DIR)/configure
cd $(MAC_OSX_DIR); autoheader; touch $@
$(TOP_DIR)/manifest.uuid:
- printf "git." >$(TOP_DIR)/manifest.uuid
- git rev-parse HEAD >>$(TOP_DIR)/manifest.uuid
+ printf "git-" >$(TOP_DIR)/manifest.uuid
+ (cd $(TOP_DIR); git rev-parse HEAD >>$(TOP_DIR)/manifest.uuid || printf "unknown" >$(TOP_DIR)/manifest.uuid)
dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(UNIX_DIR)/tcl.pc.in genstubs \
$(MAC_OSX_DIR)/configure $(TOP_DIR)/manifest.uuid dist-packages ${NATIVE_TCLSH}