From 3647cca9f7bc51da8d62ddd1c3a1de36e90d7533 Mon Sep 17 00:00:00 2001
From: Tim Angus <tim@ngus.net>
Date: Sun, 30 Oct 2005 14:36:49 +0000
Subject: [PATCH] * Applied https://bugzilla.icculus.org/show_bug.cgi?id=2464 *
 Removed rule to build C++ (for splines) from the Makefile

---
 code/unix/Makefile | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/code/unix/Makefile b/code/unix/Makefile
index 46abd59d..98d487f7 100644
--- a/code/unix/Makefile
+++ b/code/unix/Makefile
@@ -854,10 +854,6 @@ endif #FreeBSD
 $(B)/$(PLATFORM)quake3$(BINEXT): $(Q3OBJ) $(Q3POBJ)
 	$(CC)  -o $@ $(Q3OBJ) $(Q3POBJ) $(GLLDFLAGS) $(LDFLAGS)
 
-# TTimo: splines code requires C++ linking, but splines have
-# not been officially included in the codebase
-#	$(CXX)  -o $@ $(Q3OBJ) $(Q3POBJ) $(GLLDFLAGS) $(LDFLAGS)
-
 $(B)/$(PLATFORM)quake3-smp$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP)
 	$(CC)  -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(GLLDFLAGS) \
 		$(THREAD_LDFLAGS) $(LDFLAGS)
@@ -1534,12 +1530,11 @@ $(B)/missionpack/qcommon/%.asm: $(CMDIR)/%.c $(Q3LCC)
 # MISC
 #############################################################################
 
-copyfiles:
-	@if [ ! -d $(COPYDIR) ]; then echo "You need to set COPYDIR to where you installed Quake III!"; false; fi
-	-mkdir -p -m 0755 $(COPYDIR)
-	install -s -m 0755 $(BR)/linuxquake3 $(COPYDIR)/quake3
-	#install -s -m 0755 $(BR)/linuxquake3-smp $(COPYDIR)/quake3-smp
-	install -s -m 0755 $(BR)/linuxq3ded $(COPYDIR)/q3ded
+copyfiles: build_release
+	@if [ ! -d $(COPYDIR)/baseq3 ]; then echo "You need to set COPYDIR to where you installed Quake III!"; false; fi
+	install -s -m 0755 $(BR)/$(PLATFORM)quake3$(BINEXT) $(COPYDIR)/quake3
+	#install -s -m 0755 $(BR)/$(PLATFORM)quake3-smp$(BINEXT) $(COPYDIR)/quake3-smp
+	install -s -m 0755 $(BR)/$(PLATFORM)q3ded$(BINEXT) $(COPYDIR)/q3ded
 	-mkdir -p -m 0755 $(COPYDIR)/baseq3
 	install -s -m 0755 $(BR)/baseq3/cgame$(ARCH).$(SHLIBEXT) \
 					$(COPYDIR)/baseq3/.