Sophie

Sophie

distrib > Fedora > 14 > x86_64 > by-pkgid > 43be97ffa58d59d2c80c39f6a6f1c65e > files > 7

koules-1.4-9.fc14.src.rpm

Do not add arbitrary compiler flags and install into relative location.

Lubomir Rintel <lkundrak@v3.sk>

--- koules1.4/Makefile.svgalib.make	1998-03-09 16:48:49.000000000 +0100
+++ koules1.4/Makefile.svgalib	2007-10-29 17:46:02.000000000 +0100
@@ -24,11 +24,10 @@
 INSTBINFLAGS=-m a=rxs,u=rwxs
 INSTALL = install
 
-CC	 = gcc
-OPTIMIZE = -Isvgalib -fomit-frame-pointer -O3 -ffast-math -s -Dlinux -Wall -DHAVEUSLEEP
-OPTIMIZE1 = -I svgalib -fomit-frame-pointer -O6  -ffast-math -funroll-loops -finline-functions   -s -Dlinux -Wall -DHAVEUSLEEP
-CFLAGS	 = $(DEFINES) $(ARCH) $(JOYSTICK) -DSOUNDDIR="\"$(SOUNDDIR)\"" $(SOUND) $(MOUSE) $(NET)\
-	-DSOUNDSERVER=\"$(SOUNDDIR)/$(SOUNDSERVER)\" \
+OPTIMIZE = -Isvgalib -DHAVEUSLEEP -O -finline-functions -ffast-math
+OPTIMIZE1 = -Isvgalib -DHAVEUSLEEP -O -finline-functions -funroll-loops -ffast-math
+CFLAGS	 += $(DEFINES) $(ARCH) $(JOYSTICK) -DSOUNDDIR="\"$(SOUNDDIR)\"" $(SOUND) $(MOUSE) $(NET)\
+	-DSOUNDSERVER=\"$(LIBEXECDIR)$(SOUNDSERVER)\" \
 	-DSOUNDDIR=\"$(SOUNDDIR)\" \
 	-DSOUNDDEV=\"$(SOUNDDEV)\"
 
@@ -74,22 +73,22 @@
 	@echo "Koules directory is " $(BINDIR)
 	@:
 	@echo "Instalin man page to " $(MANDIR)
-	$(INSTALL) -c $(INSTMANFLAGS) koules.svga.6 $(MANDIR);
+	$(INSTALL) -c $(INSTMANFLAGS) koules.svga.6 $(DESTDIR)$(MANDIR);
 	@:
 	@echo "Creating directory " $(BINDIR)
-	@if [ ! -d $(BINDIR) ]; then mkdir $(BINDIR); fi
-	$(INSTALL) -c -s $(INSTBINFLAGS) koules.svga $(BINDIR)
+	@if [ ! -d $(DESTDIR)$(BINDIR) ]; then mkdir $(DESTDIR)$(BINDIR); fi
+	$(INSTALL) -c -s $(INSTBINFLAGS) koules.svga $(DESTDIR)$(BINDIR)
 	@:
 	@if [ "$(INSTALLSOUND)" = "True" ]; 				\
 	 then								\
 		echo "Creating directory " $(SOUNDDIR); 		\
-		if [ ! -d $(SOUNDDIR) ]; then mkdir $(SOUNDDIR); fi;    \
+		if [ ! -d $(DESTDIR)$(SOUNDDIR) ]; then mkdir $(DESTDIR)$(SOUNDDIR); fi;    \
 		echo "Copying sound server to directory " $(SOUNDDIR); \
-		$(INSTALL) -c -s $(INSTBIN1FLAGS) $(SOUNDSERVER) $(SOUNDDIR); \
+		$(INSTALL) -c -s $(INSTBIN1FLAGS) $(SOUNDSERVER) $(DESTDIR)$(LIBEXECDIR); \
 		echo "Copying sound files into directory " $(SOUNDDIR); \
 		cd ./sounds; set -x;					\
 		for file in *.raw; do					\
-		    $(INSTALL) -c $(INSTDATFLAGS) $$file $(SOUNDDIR);	\
+		    $(INSTALL) -c $(INSTDATFLAGS) $$file $(DESTDIR)$(SOUNDDIR);	\
 		done;   						\
 	 fi
 	@echo "Don't forget to remove your old koules from /usr/games/koules "