From e2c50a5dd0747f1029bab8192af1e4adf17b1212 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Sun, 14 Jun 2009 17:15:06 +0000 Subject: updated for Tcl/Tk 8.5 and better DESTDIR support svn path=/trunk/; revision=11770 --- packages/win32_inno/Makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'packages') diff --git a/packages/win32_inno/Makefile b/packages/win32_inno/Makefile index 08aa016a..ad17e58f 100755 --- a/packages/win32_inno/Makefile +++ b/packages/win32_inno/Makefile @@ -81,29 +81,29 @@ lib_install: install -p $(bin_src)/lua51.dll $(dlldir) install -p $(bin_src)/pthreadGC2.dll $(dlldir) # these stay with pd.exe - install -p $(bin_src)/tcl84.dll $(bindir) - install -p $(bin_src)/tclpip84.dll $(bindir) - install -p $(bin_src)/tk84.dll $(bindir) + install -p $(bin_src)/tcl85.dll $(bindir) + install -p $(bin_src)/tclpip85.dll $(bindir) + install -p $(bin_src)/tk85.dll $(bindir) # if these are there, install them -install -p $(system32)/msvcp71.dll $(dlldir) -install -p $(system32)/msvcr71.dll $(dlldir) -install -p $(system32)/pthreadVC.dll $(dlldir) # these go into the Pd package's lib dir - install -d $(libdir)/tcl8.4 - cp -r /usr/local/lib/tcl8.4/* $(libdir)/tcl8.4 - install -d $(libdir)/tk8.4 - cp -r /usr/local/lib/tk8.4/* $(libdir)/tk8.4 + install -d $(DESTDIR)$(libdir)/tcl8.5 + cp -r /usr/local/lib/tcl8.5/* $(DESTDIR)$(libdir)/tcl8.5 + install -d $(DESTDIR)$(libdir)/tk8.5 + cp -r /usr/local/lib/tk8.5/* $(DESTDIR)$(libdir)/tk8.5 exe_install: install -d $(bindir) - install -p $(bin_src)/wish84.exe $(bindir) - install -p $(bin_src)/tclsh84.exe $(bindir) + install -p $(bin_src)/wish85.exe $(bindir) + install -p $(bin_src)/tclsh85.exe $(bindir) # on Windows, the pddp tcl files need to be in pd/lib aka $(libdir) pddplink_hack: - install -d $(libdir)/pddp + install -d $(DESTDIR)$(libdir)/pddp install -p $(externals_src)/miXed/bin/pddp/*.tcl $(libdir)/pddp -- cgit v1.2.1