SOURCES: quake3-gpl-Makefile-install.patch - updated

[sparky]

Author: sparky                       Date: Tue Jan 24 00:22:51 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   quake3-gpl-Makefile-install.patch (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SOURCES/quake3-gpl-Makefile-install.patch
diff -u SOURCES/quake3-gpl-Makefile-install.patch:1.7 SOURCES/quake3-gpl-Makefile-install.patch:1.8
--- SOURCES/quake3-gpl-Makefile-install.patch:1.7	Fri Dec 23 17:09:11 2005
+++ SOURCES/quake3-gpl-Makefile-install.patch	Tue Jan 24 01:22:45 2006
@@ -1,8 +1,7 @@
-diff -ur quake3/code/unix/Makefile quake3.Makefile/code/unix/Makefile
---- quake3/code/unix/Makefile	2005-12-05 02:38:48.000000000 +0100
-+++ quake3.Makefile/code/unix/Makefile	2005-12-05 17:42:51.000000000 +0100
-@@ -123,9 +123,6 @@
-   GLIBC=-glibc
+--- quake3/Makefile	2005-12-05 02:38:48.000000000 +0100
++++ quake3.Makefile/Makefile	2005-12-05 17:42:51.000000000 +0100
+@@ -151,9 +151,6 @@
+ 
    CC=gcc
  
 -  ifeq ($(ARCH),alpha)
@@ -11,7 +10,7 @@
    ifeq ($(ARCH),x86_64)
      LIB=lib64
    else
-@@ -137,7 +134,6 @@
+@@ -165,7 +162,6 @@
    endif
    endif
    endif
@@ -19,51 +18,15 @@
  
    BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -pipe
  
-@@ -225,13 +221,7 @@
-       $(B)/missionpack/cgame$(ARCH).$(SHLIBEXT) \
-       $(B)/missionpack/qagame$(ARCH).$(SHLIBEXT) \
-       $(B)/missionpack/ui$(ARCH).$(SHLIBEXT) \
--      $(B)/baseq3/vm/cgame.qvm \
--      $(B)/baseq3/vm/qagame.qvm \
--      $(B)/baseq3/vm/ui.qvm \
--      $(B)/missionpack/vm/qagame.qvm \
--      $(B)/missionpack/vm/cgame.qvm \
--      $(B)/missionpack/vm/ui.qvm
--#      $(B)/$(PLATFORM)quake3-smp \
-+#      $(B)/$(PLATFORM)quake3-smp \ # context
- 
-   endif
+@@ -1654,6 +1650,26 @@
+ 	$(INSTALL) -s -m 0755 $(BR)/missionpack/ui$(ARCH).$(SHLIBEXT) \
+ 					$(COPYDIR)/missionpack/.
  
-@@ -1762,27 +1752,25 @@
- # MISC
- #############################################################################
- 
--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
--
--	@if [ -f $(BR)/$(PLATFORM)q3ded$(BINEXT) ]; then \
--		$(INSTALL) -s -m 0755 $(BR)/$(PLATFORM)q3ded$(BINEXT) $(COPYDIR)/q3ded$(BINEXT); \
--	fi 
--	-$(MKDIR) -p -m 0755 $(COPYDIR)/baseq3
--	$(INSTALL) -s -m 0755 $(BR)/baseq3/cgame$(ARCH).$(SHLIBEXT) \
--					$(COPYDIR)/baseq3/.
--	$(INSTALL) -s -m 0755 $(BR)/baseq3/qagame$(ARCH).$(SHLIBEXT) \
--					$(COPYDIR)/baseq3/.
--	$(INSTALL) -s -m 0755 $(BR)/baseq3/ui$(ARCH).$(SHLIBEXT) \
--					$(COPYDIR)/baseq3/.
--	-$(MKDIR) -p -m 0755 $(COPYDIR)/missionpack
--	$(INSTALL) -s -m 0755 $(BR)/missionpack/cgame$(ARCH).$(SHLIBEXT) \
--					$(COPYDIR)/missionpack/.
--	$(INSTALL) -s -m 0755 $(BR)/missionpack/qagame$(ARCH).$(SHLIBEXT) \
--					$(COPYDIR)/missionpack/.
--	$(INSTALL) -s -m 0755 $(BR)/missionpack/ui$(ARCH).$(SHLIBEXT) \
--					$(COPYDIR)/missionpack/.
 +install:
 +	-$(MKDIR) -p -m 0755 $(BINDIR)/baseq3
-+	$(INSTALL) -m 0755 $(BR)/$(PLATFORM)quake3$(BINEXT) $(BINDIR)/quake3
-+	#$(INSTALL) -m 0755 $(BR)/$(PLATFORM)quake3-smp$(BINEXT) $(BINDIR)/quake3-smp
-+	$(INSTALL) -m 0755 $(BR)/$(PLATFORM)q3ded$(BINEXT) $(BINDIR)/q3ded
++	$(INSTALL) -m 0755 $(BR)/ioquake3.$(ARCH)$(BINEXT) $(BINDIR)/quake3
++	$(INSTALL) -m 0755 $(BR)/ioquake3-smp.$(ARCH)$(BINEXT) $(BINDIR)/quake3-smp
++	$(INSTALL) -m 0755 $(BR)/ioq3ded.$(ARCH)$(BINEXT) $(BINDIR)/q3ded
 +	-$(MKDIR) -p -m 0755 $(Q3LIBDIR)/baseq3
 +	$(INSTALL) -m 0755 $(BR)/baseq3/cgame$(ARCH).$(SHLIBEXT) \
 +					$(Q3LIBDIR)/baseq3/.
@@ -78,6 +41,7 @@
 +					$(Q3LIBDIR)/missionpack/.
 +	$(INSTALL) -m 0755 $(BR)/missionpack/ui$(ARCH).$(SHLIBEXT) \
 +					$(Q3LIBDIR)/missionpack/.
- 
++
  clean:clean-debug clean-release
- 	$(MAKE) -C setup clean
+ 	$(MAKE) -C $(LOKISETUPDIR) clean
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/quake3-gpl-Makefile-install.patch?r1=1.7&r2=1.8&f=u