diff options
author | dgp <dgp@users.sourceforge.net> | 2012-11-19 16:54:41 (GMT) |
---|---|---|
committer | dgp <dgp@users.sourceforge.net> | 2012-11-19 16:54:41 (GMT) |
commit | f124336e8992c21d46f536a92e03465d5232b4d1 (patch) | |
tree | 7abee972bbcb96a07d223f0be4d54bb1105edb3a /unix | |
parent | 04079d1a344fc35bbadaa939c1dab0cb566ff801 (diff) | |
parent | 0b6e717a44dff02a2ce046473bbe798a8e07d6c9 (diff) | |
download | tk-f124336e8992c21d46f536a92e03465d5232b4d1.zip tk-f124336e8992c21d46f536a92e03465d5232b4d1.tar.gz tk-f124336e8992c21d46f536a92e03465d5232b4d1.tar.bz2 |
merge 8.4
Diffstat (limited to 'unix')
-rw-r--r-- | unix/Makefile.in | 15 | ||||
-rw-r--r-- | unix/README | 3 | ||||
-rwxr-xr-x[-rw-r--r--] | unix/install-sh | 0 | ||||
-rw-r--r-- | unix/tkUnix3d.c | 2 | ||||
-rw-r--r-- | unix/tkUnixDraw.c | 2 |
5 files changed, 3 insertions, 19 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 637f6f4..e2c0289 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -1499,21 +1499,6 @@ BUILD_HTML = \ --srcdir=$(TOP_DIR)/.. $(BUILD_HTML_FLAGS) # -# Target to create a Macintosh version of the distribution. This will -# do a normal distribution and then massage the output to prepare it -# for moving to the Mac platform. This requires a few scripts and -# programs found only in the Tcl greoup's tool workspace. -# - -macdist: dist - rm -f $(DISTDIR)/mac/tkMacProjects.sea.hqx - $(TCL_EXE) $(TOOL_DIR)/man2html.tcl $(DISTDIR)/tmp ../.. tk$(VERSION) - mv $(DISTDIR)/tmp/tk$(VERSION) $(DISTDIR)/html - rm -rf $(DISTDIR)/doc - rm -rf $(DISTDIR)/tmp - $(TCL_EXE) $(TOOL_DIR)/cvtEOL.tcl $(DISTDIR) - -# # Targets to build Solaris package of the distribution for the current # architecture. To build stream packages for both sun4 and i86pc # architectures: diff --git a/unix/README b/unix/README index cafe2c4..54bf387 100644 --- a/unix/README +++ b/unix/README @@ -18,8 +18,7 @@ changes on any UNIX-like system that approximates POSIX, BSD, or System V. We know that it runs on workstations from Sun, H-P, DEC, IBM, and SGI, as well as PCs running Linux, BSDI, and SCO UNIX. To compile for a PC running Windows, see the README file in the directory ../win. To -compile for Mac OS X, see the README file in the directory ../macosx. To -compile for a classic Macintosh, see the README file in the directory ../mac. +compile for Mac OS X, see the README file in the directory ../macosx. How To Compile And Install Tk: ------------------------------ diff --git a/unix/install-sh b/unix/install-sh index a9a1f27..a9a1f27 100644..100755 --- a/unix/install-sh +++ b/unix/install-sh diff --git a/unix/tkUnix3d.c b/unix/tkUnix3d.c index 0c460dc..331ebe3 100644 --- a/unix/tkUnix3d.c +++ b/unix/tkUnix3d.c @@ -12,7 +12,7 @@ #include <tk3d.h> -#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK)) +#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) #include "tkUnixInt.h" #endif diff --git a/unix/tkUnixDraw.c b/unix/tkUnixDraw.c index 9b84ab1..adde20d 100644 --- a/unix/tkUnixDraw.c +++ b/unix/tkUnixDraw.c @@ -12,7 +12,7 @@ #include "tkPort.h" #include "tkInt.h" -#if !defined(__WIN32__) && !defined(MAC_TCL) +#if !defined(__WIN32__) #include "tkUnixInt.h" #endif |