From 5b13e23b457831b881db4e80deb41fbf5d1190e1 Mon Sep 17 00:00:00 2001
From: Tim Angus <tim@ngus.net>
Date: Wed, 18 Jan 2006 21:18:12 +0000
Subject: * Merged ioq3-r506 * Removed copyfiles rule from Makefile

---
 Makefile | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 8a0c89f8..d154a70d 100644
--- a/Makefile
+++ b/Makefile
@@ -1441,21 +1441,6 @@ $(B)/base/qcommon/%.asm: $(CMDIR)/%.c
 # MISC
 #############################################################################
 
-copyfiles: build_release
-	@if [ ! -d $(COPYDIR)/baseq3 ]; then echo "You need to set COPYDIR to where you installed Trem!"; false; fi
-	$(INSTALL) -s -m 0755 $(BR)/tremulous.$(ARCH)$(BINEXT) $(COPYDIR)/tremulous.$(ARCH)$(BINEXT)
-
-	@if [ -f $(BR)/tremded.$(ARCH)$(BINEXT) ]; then \
-		$(INSTALL) -s -m 0755 $(BR)/tremded.$(ARCH)$(BINEXT) $(COPYDIR)/tremded.$(ARCH)$(BINEXT); \
-	fi
-	-$(MKDIR) -p -m 0755 $(COPYDIR)/base
-	$(INSTALL) -s -m 0755 $(BR)/base/cgame$(ARCH).$(SHLIBEXT) \
-					$(COPYDIR)/base/.
-	$(INSTALL) -s -m 0755 $(BR)/base/game$(ARCH).$(SHLIBEXT) \
-					$(COPYDIR)/base/.
-	$(INSTALL) -s -m 0755 $(BR)/base/ui$(ARCH).$(SHLIBEXT) \
-					$(COPYDIR)/base/.
-
 clean:clean-debug clean-release
 	$(MAKE) -C $(MASTERDIR) clean
 
@@ -1472,10 +1457,16 @@ clean-debug:
 clean-release:
 	$(MAKE) clean2 B=$(BR) CFLAGS="$(RELEASE_CFLAGS)"
 
-distclean: clean
+toolsclean:
 	$(MAKE) -C $(TOOLSDIR)/asm clean uninstall
 	$(MAKE) -C $(TOOLSDIR)/lcc clean uninstall
 
+distclean: clean toolsclean
+	rm -rf $(BUILD_DIR)
+
+installer: build_release
+	$(MAKE) VERSION=$(VERSION) -C $(LOKISETUPDIR)
+
 dist:
 	rm -rf tremulous-$(SVN_VERSION)
 	svn export . tremulous-$(SVN_VERSION)
-- 
cgit