summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstwo <stwo>2013-01-31 13:52:15 (GMT)
committerstwo <stwo>2013-01-31 13:52:15 (GMT)
commit033fb9b29553c8412794a824fc6efe994e686397 (patch)
treecfaf8fa763885d348f7aee5a0410e4e6cf9c1ce2
parent3cd0a536490310cda2013a4315da05461a0fc8c6 (diff)
downloadtcl-033fb9b29553c8412794a824fc6efe994e686397.zip
tcl-033fb9b29553c8412794a824fc6efe994e686397.tar.gz
tcl-033fb9b29553c8412794a824fc6efe994e686397.tar.bz2
Bug [3598282]: Stop using installData.tcl to install the timezone files.
-rw-r--r--unix/Makefile.in37
1 files changed, 32 insertions, 5 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 2f64602..afde755 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -793,12 +793,39 @@ install-libraries: libraries $(INSTALL_TZDATA) install-msgs
"$(SCRIPT_INSTALL_DIR)"/tm.tcl; \
fi
-install-tzdata: ${TCL_EXE}
+install-tzdata:
+ @for i in tzdata; \
+ do \
+ if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
+ echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
+ $(INSTALL_DATA_DIR) "$(SCRIPT_INSTALL_DIR)"/$$i; \
+ else true; \
+ fi; \
+ done;
@echo "Installing time zone files to $(SCRIPT_INSTALL_DIR)/tzdata/"
- @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \
- TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
- ./${TCL_EXE} $(TOOL_DIR)/installData.tcl \
- $(TOP_DIR)/library/tzdata "$(SCRIPT_INSTALL_DIR)"/tzdata
+ @for i in $(TOP_DIR)/library/tzdata/* ; do \
+ if [ -d $$i ] ; then \
+ ii=`basename $$i`; \
+ if [ ! -d "$(SCRIPT_INSTALL_DIR)"/tzdata/$$ii ] ; then \
+ $(INSTALL_DATA_DIR) "$(SCRIPT_INSTALL_DIR)"/tzdata/$$ii; \
+ fi; \
+ for j in $$i/* ; do \
+ if [ -d $$j ] ; then \
+ jj=`basename $$j`; \
+ if [ ! -d "$(SCRIPT_INSTALL_DIR)"/tzdata/$$ii/$$jj ] ; then \
+ $(INSTALL_DATA_DIR) "$(SCRIPT_INSTALL_DIR)"/tzdata/$$ii/$$jj; \
+ fi; \
+ for k in $$j/* ; do \
+ $(INSTALL_DATA) $$k "$(SCRIPT_INSTALL_DIR)"/tzdata/$$ii/$$jj; \
+ done; \
+ else \
+ $(INSTALL_DATA) $$j "$(SCRIPT_INSTALL_DIR)"/tzdata/$$ii; \
+ fi; \
+ done; \
+ else \
+ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/tzdata; \
+ fi; \
+ done;
install-msgs:
@for i in msgs; \