packages: rezerwar/rezerwar-makefile.patch - updated for 0.4

[lisu]

Author: lisu                         Date: Thu Sep 10 12:18:28 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated for 0.4

---- Files affected:
packages/rezerwar:
   rezerwar-makefile.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/rezerwar/rezerwar-makefile.patch
diff -u packages/rezerwar/rezerwar-makefile.patch:1.1 packages/rezerwar/rezerwar-makefile.patch:1.2
--- packages/rezerwar/rezerwar-makefile.patch:1.1	Fri Aug 21 10:57:21 2009
+++ packages/rezerwar/rezerwar-makefile.patch	Thu Sep 10 14:18:23 2009
@@ -1,60 +1,42 @@
---- rezerwar-0.3/mkfiles/Makefile.unix~	2009-08-10 14:30:36.000000000 +0200
-+++ rezerwar-0.3/mkfiles/Makefile.unix	2009-08-20 14:23:16.000000000 +0200
-@@ -4,7 +4,7 @@
- # Copyright (c) 2009 Bertrand Janin
- #
- 
--TARGET=/usr/share/games/rezerwar
-+TARGET=/usr/share/rezerwar
- DATATARGET=${TARGET}/data
- 
- all: build
-@@ -27,17 +27,16 @@
- 	ln -s mkfiles/Makefile.default MkConf
- 
- install:
--	mkdir -p /usr/games
--	mkdir -p ${DATATARGET}/gfx
--	mkdir -p ${DATATARGET}/music
--	mkdir -p ${DATATARGET}/sfx
--	mkdir -p ${DATATARGET}/levels
--	cp -rf doc ${TARGET}
--	install -m 644 data/gfx/*.bmp ${DATATARGET}/gfx/
--	install -m 644 data/levels/* ${DATATARGET}/levels/
--	install -m 644 data/sfx/*.wav ${DATATARGET}/sfx/
--	install -m 644 data/music/*.mp3 ${DATATARGET}/music/
--	install -m 755 src/rezerwar /usr/games
-+	mkdir -p $(DESTDIR)/usr/bin
-+	mkdir -p $(DESTDIR)${DATATARGET}/gfx
-+	mkdir -p $(DESTDIR)${DATATARGET}/music
-+	mkdir -p $(DESTDIR)${DATATARGET}/sfx
-+	mkdir -p $(DESTDIR)${DATATARGET}/levels
-+	install data/gfx/*.bmp $(DESTDIR)${DATATARGET}/gfx/
-+	install data/levels/* $(DESTDIR)${DATATARGET}/levels/
-+	install data/sfx/*.wav $(DESTDIR)${DATATARGET}/sfx/
-+	install data/music/*.mp3 $(DESTDIR)${DATATARGET}/music/
-+	install src/rezerwar $(DESTDIR)/usr/bin
- 
- uninstall:
- 	rm -f /usr/games/rezerwar
---- rezerwar-0.3/src/Makefile~	2009-08-10 14:30:36.000000000 +0200
-+++ rezerwar-0.3/src/Makefile	2009-08-20 15:44:06.000000000 +0200
-@@ -42,6 +42,6 @@
- 	valgrind --leak-check=full --show-reachable=yes ./$(PROGRAM) >& LOG
- 
- win32:
--	$(CC) $(OBJECTS) ../data/gfx/icons/icons.o $(LIBS) -o $(PROGRAM)
-+	$(CC) $(LDFLAGS) $(OBJECTS) ../data/gfx/icons/icons.o -o $(PROGRAM) $(LIBS)
- 	strip -s $(PROGRAM).exe
- 	upx $(PROGRAM).exe
---- rezerwar-0.3/src/Makefile~	2009-08-10 14:30:36.000000000 +0200
-+++ rezerwar-0.3/src/Makefile	2009-08-20 15:46:18.000000000 +0200
-@@ -18,7 +18,7 @@
+--- rezerwar-0.4/mkfiles/Makefile.src~	2009-09-09 22:45:47.000000000 +0200
++++ rezerwar-0.4/mkfiles/Makefile.src	2009-09-10 13:45:52.000000000 +0200
+@@ -10,7 +10,7 @@
  all: $(PROGRAM)
  
  $(PROGRAM): $(OBJECTS)
 -	$(CC) $(OBJECTS) $(LIBS) -o $(PROGRAM)
-+	$(CC) $(LDFLAGS) $(OBJECTS) -o $(PROGRAM) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) -o $(PROGRAM) $(LIBS)
  
- $(OBJECTS): %.o: %.c rezerwar.h ../config.h
+ $(OBJECTS): %.o: %.c rezerwar.h config.h
  	$(CC) $(CFLAGS) -c $<
+--- rezerwar-0.4/mkfiles/Makefile.main~	2009-09-09 22:45:47.000000000 +0200
++++ rezerwar-0.4/mkfiles/Makefile.main	2009-09-10 13:56:48.000000000 +0200
+@@ -28,16 +28,16 @@
+ 	rm -f doc/DOWNLOADS
+ 
+ install:
+-	mkdir -p ${TARGET_BIN} ${TARGET_DOC} ${TARGET_DATA}
+-	mkdir -p ${TARGET_DATA}/gfx
+-	mkdir -p ${TARGET_DATA}/music
+-	mkdir -p ${TARGET_DATA}/sfx
+-	mkdir -p ${TARGET_DATA}/levels
+-	mkdir -p ${TARGET_DOC}
+-	install -m 644 doc/* ${TARGET_DOC}/
+-	install -m 644 data/gfx/*.bmp ${TARGET_DATA}/gfx/
+-	install -m 644 data/levels/* ${TARGET_DATA}/levels/
+-	install -m 644 data/sfx/*.wav ${TARGET_DATA}/sfx/
+-	install -m 644 data/music/*.ogg ${TARGET_DATA}/music/
+-	install -m 755 src/rezerwar ${TARGET_BIN}/
++	mkdir -p $(DESTDIR)${TARGET_BIN} $(DESTDIR)${TARGET_DOC} $(DESTDIR)${TARGET_DATA}
++	mkdir -p $(DESTDIR)${TARGET_DATA}/gfx
++	mkdir -p $(DESTDIR)${TARGET_DATA}/music
++	mkdir -p $(DESTDIR)${TARGET_DATA}/sfx
++	mkdir -p $(DESTDIR)${TARGET_DATA}/levels
++	mkdir -p $(DESTDIR)${TARGET_DOC}
++	install doc/* $(DESTDIR)${TARGET_DOC}/
++	install data/gfx/*.bmp $(DESTDIR)${TARGET_DATA}/gfx/
++	install data/levels/* $(DESTDIR)${TARGET_DATA}/levels/
++	install data/sfx/*.wav $(DESTDIR)${TARGET_DATA}/sfx/
++	install data/music/*.ogg $(DESTDIR)${TARGET_DATA}/music/
++	install src/rezerwar $(DESTDIR)${TARGET_BIN}/
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rezerwar/rezerwar-makefile.patch?r1=1.1&r2=1.2&f=u