[quake3-commits] r1868 - trunk

[DONOTREPLY at icculus.org]

Author: thilo
Date: 2011-02-06 23:03:19 -0500 (Sun, 06 Feb 2011)
New Revision: 1868

Modified:
   trunk/Makefile
   trunk/README
Log:
Allow user to specify different temp dir for building (#4349)


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2011-02-07 03:56:15 UTC (rev 1867)
+++ trunk/Makefile	2011-02-07 04:03:19 UTC (rev 1868)
@@ -103,6 +103,10 @@
 BUILD_DIR=build
 endif
 
+ifndef TEMPDIR
+TEMPDIR=/tmp
+endif
+
 ifndef GENERATE_DEPENDENCIES
 GENERATE_DEPENDENCIES=1
 endif
@@ -184,7 +188,6 @@
 NSISDIR=misc/nsis
 SDLHDIR=$(MOUNT_DIR)/SDL12
 LIBSDIR=$(MOUNT_DIR)/libs
-TEMPDIR=/tmp
 
 bin_path=$(shell which $(1) 2> /dev/null)
 
@@ -239,8 +242,6 @@
 INSTALL=install
 MKDIR=mkdir
 
-#ifneq (,$(findstring i86pc,$(shell uname -m)))
-#ifneq (,findstring($(PLATFORM),linux gnu_kfreebsd kfreebsd-gnu))
 ifneq (,$(findstring $(PLATFORM), linux gnu_kfreebsd kfreebsd-gnu))
 
   ifeq ($(ARCH),axp)

Modified: trunk/README
===================================================================
--- trunk/README	2011-02-07 03:56:15 UTC (rev 1867)
+++ trunk/README	2011-02-07 04:03:19 UTC (rev 1868)
@@ -93,6 +93,7 @@
   USE_CODEC_VORBIS  - enable Ogg Vorbis support
   USE_LOCAL_HEADERS - use headers local to ioq3 instead of system ones
   COPYDIR           - the target installation directory
+  TEMPDIR           - specify user defined directory for temp files
 
 The defaults for these variables differ depending on the target platform.