diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-20 08:41:19 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-20 08:41:19 (GMT) |
| commit | fee98d6fc05284034d11e98d448f1b4cbeaaecc3 (patch) | |
| tree | 36fc146c590b8ebb72668625f56cef556d8d5461 | |
| parent | 4c892cb6cd89b06affe47b9823ffa2a98efed824 (diff) | |
| download | tk-fee98d6fc05284034d11e98d448f1b4cbeaaecc3.zip tk-fee98d6fc05284034d11e98d448f1b4cbeaaecc3.tar.gz tk-fee98d6fc05284034d11e98d448f1b4cbeaaecc3.tar.bz2 | |
Don't use ".." in Windows paths during build. Taken from Tcl [https://core.tcl-lang.org/tcl/info/40d5ff2a0ee78099|40d5ff2a0e]
| -rw-r--r-- | win/Makefile.in | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 632e216..09db089 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -25,6 +25,7 @@ exec_prefix = @exec_prefix@ bindir = @bindir@ libdir = @libdir@ includedir = @includedir@ +datarootdir = @datarootdir@ mandir = @mandir@ # The following definition can be set to non-null for special systems @@ -98,6 +99,17 @@ TCL_PLATFORM_DIR = @TCL_SRC_DIR@/win TCL_TOOL_DIR = @TCL_SRC_DIR@/tools +SRC_DIR = @srcdir@ +ROOT_DIR = @srcdir@/.. +TOP_DIR = $(shell cd @srcdir@/..; pwd -W 2>/dev/null || pwd -P) +WIN_DIR = $(TOP_DIR)/win +UNIX_DIR = $(TOP_DIR)/unix +GENERIC_DIR = $(TOP_DIR)/generic +TTK_DIR = $(GENERIC_DIR)/ttk +BITMAP_DIR = $(TOP_DIR)/bitmaps +XLIB_DIR = $(TOP_DIR)/xlib +RC_DIR = $(WIN_DIR)/rc + # Converts a POSIX path to a Windows native path. CYGPATH = @CYGPATH@ @@ -105,16 +117,6 @@ CYGPATH = @CYGPATH@ TCL_LIB_FILE = "$(shell $(CYGPATH) '@TCL_BIN_DIR@/@TCL_LIB_FILE@')" TCL_STUB_LIB_FILE = "$(shell $(CYGPATH) '@TCL_BIN_DIR@/@TCL_STUB_LIB_FILE@')" -SRC_DIR = @srcdir@ -ROOT_DIR = $(SRC_DIR)/.. -WIN_DIR = $(SRC_DIR) -UNIX_DIR = $(SRC_DIR)/../unix -GENERIC_DIR = $(SRC_DIR)/../generic -TTK_DIR = $(GENERIC_DIR)/ttk -BITMAP_DIR = $(ROOT_DIR)/bitmaps -XLIB_DIR = $(ROOT_DIR)/xlib -RC_DIR = $(WIN_DIR)/rc - ROOT_DIR_NATIVE = $(shell $(CYGPATH) '$(ROOT_DIR)' | sed 's!\\!/!g') WIN_DIR_NATIVE = $(shell $(CYGPATH) '$(WIN_DIR)' | sed 's!\\!/!g') GENERIC_DIR_NATIVE = $(shell $(CYGPATH) '$(GENERIC_DIR)' | sed 's!\\!/!g') |