diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-20 08:43:10 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-20 08:43:10 (GMT) |
| commit | a3568def587d4faa8ca331aa501e163bf9f2c99d (patch) | |
| tree | aa3e30f20a1946b3f6bc054a55483851ab142d89 | |
| parent | dff6d16fcad7edb9640b8459ddd29d6415c6625e (diff) | |
| parent | fee98d6fc05284034d11e98d448f1b4cbeaaecc3 (diff) | |
| download | tk-a3568def587d4faa8ca331aa501e163bf9f2c99d.zip tk-a3568def587d4faa8ca331aa501e163bf9f2c99d.tar.gz tk-a3568def587d4faa8ca331aa501e163bf9f2c99d.tar.bz2 | |
Merge 8.5
| -rw-r--r-- | win/Makefile.in | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index e878484..9fe8ada 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -101,6 +101,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@ @@ -108,16 +119,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') |