[quake3] Re: [quake3-commits] r441 - trunk/code/unix

[K. Spoon]

444 has problems running copyfiles with a truly weird "unexpected eof" 
error.  Did a funky char slip into the file maybe? Also, it's missing a
semicolon... attached patch makes it all happy again on my system.  :) 

On Mon, Dec 12, 2005 at 05:09:18PM +1100, Jamie Wilkinson wrote:
> This one time, at band camp, DONOTREPLY at icculus.org wrote:
> >Author: floam
> >Date: 2005-12-12 00:41:10 -0500 (Mon, 12 Dec 2005)
> >New Revision: 441
> >
> >Modified:
> >   trunk/code/unix/Makefile
> >Log:
> >Try different way
> >
> >
> >Modified: trunk/code/unix/Makefile
> >===================================================================
> >--- trunk/code/unix/Makefile	2005-12-12 03:49:19 UTC (rev 440)
> >+++ trunk/code/unix/Makefile	2005-12-12 05:41:10 UTC (rev 441)
> >@@ -1767,7 +1767,8 @@
> > 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
> >-	ifneq ($(PLATFORM),mingw32)
> >+	@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
> 
> You want:
> 
>         if ...  \
>                 $(INSTALL) .. ; \
>         fi
> 
> to tell make that it's all one shell command.
> >

-- 
K. Spoon <kell at spoonix.com>
-------------- next part --------------
--- quake3/code/unix/Makefile	2005-12-12 19:38:13.000000000 -0600
+++ quake3.mine/code/unix/Makefile	2005-12-12 19:40:02.000000000 -0600
@@ -1767,10 +1765,10 @@
 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
+
+	@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/.