From dc02f5dc33fcbdbf8ab000b27dab807ca62b2942 Mon Sep 17 00:00:00 2001
From: zakk <zakk@edf5b092-35ff-0310-97b2-ce42778d08ea>
Date: Wed, 31 Aug 2005 17:43:56 +0000
Subject: First patch from vapier for easier packaging: it'd make it easier on
 people packaging up quake3 if we could set system paths for the baseq3 dir
 and if the makefile would respect things like CC/CXX from the build env

git-svn-id: svn://svn.icculus.org/quake3/trunk@47 edf5b092-35ff-0310-97b2-ce42778d08ea
---
 code/unix/Makefile | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'code/unix/Makefile')

diff --git a/code/unix/Makefile b/code/unix/Makefile
index 399c65e..acee11a 100644
--- a/code/unix/Makefile
+++ b/code/unix/Makefile
@@ -54,8 +54,6 @@ BUILD_FREETYPE=0
 ##
 #############################################################################
 
-BASEQ3_DIR=$(BDIR)/baseq3
-
 BD=debug$(ARCH)$(GLIBC)
 BR=release$(ARCH)$(GLIBC)
 CDIR=$(MOUNT_DIR)/client
@@ -96,8 +94,8 @@ LIB=lib
 ifeq ($(PLATFORM),linux)
 
   GLIBC=-glibc
-  CC=gcc
-  CXX=g++
+  CC?=gcc
+  CXX?=g++
 
   RPMARCH=$(ARCH)
   ifeq ($(ARCH),alpha)
@@ -165,8 +163,9 @@ ifeq ($(PLATFORM),linux)
   SHLIBCFLAGS=-fPIC
   SHLIBLDFLAGS=-shared $(LDFLAGS)
 
-  ARFLAGS=ar rv
-  RANLIB=ranlib
+  AR?=ar
+  ARFLAGS=rv
+  RANLIB?=ranlib
 
   THREAD_LDFLAGS=-lpthread
   LDFLAGS=-ldl -lm
@@ -344,6 +343,10 @@ endif #Linux
 endif #FreeBSD
 endif #IRIX
 
+ifdef DEFAULT_BASEDIR
+BASE_CFLAGS += -DDEFAULT_BASEDIR=\\\"$(DEFAULT_BASEDIR)\\\"
+endif
+
 DO_CC=$(CC) $(CFLAGS) -o $@ -c $<
 DO_CXX=$(CXX) $(CFLAGS) -o $@ -c $<
 DO_SMP_CC=$(CC) $(CFLAGS) -DSMP -o $@ -c $<
-- 
cgit v1.2.3