r7029 - in packages/trunk/rott/debian: . patches

[Fabian Greffrath]

Author: fabian-guest
Date: 2008-05-15 09:16:02 +0000 (Thu, 15 May 2008)
New Revision: 7029

Modified:
   packages/trunk/rott/debian/patches/rott-1.0-debian-specific.patch
   packages/trunk/rott/debian/rules
Log:
Moved "#ifndef DATADIR" from rt_main.c to rt_def.h.
Keep Makefile more generic by setting DATADIR in debian/rules.


Modified: packages/trunk/rott/debian/patches/rott-1.0-debian-specific.patch
===================================================================
--- packages/trunk/rott/debian/patches/rott-1.0-debian-specific.patch	2008-05-15 08:44:04 UTC (rev 7028)
+++ packages/trunk/rott/debian/patches/rott-1.0-debian-specific.patch	2008-05-15 09:16:02 UTC (rev 7029)
@@ -1,16 +1,14 @@
-Index: rott-1.0+dfsg/Makefile
-===================================================================
---- rott-1.0+dfsg.orig/Makefile	2008-04-22 16:19:35.000000000 +0200
-+++ rott-1.0+dfsg/Makefile	2008-04-22 16:20:43.000000000 +0200
+--- rott-1.0+dfsg.orig/Makefile
++++ rott-1.0+dfsg/Makefile
 @@ -47,13 +47,18 @@
  
  
  CC = gcc
 -CFLAGS = -g $(SDL_CFLAGS) -DUSE_SDL=1 -DPLATFORM_UNIX=1 -W -Wall -Wno-unused -Wno-pointer-sign $(EXTRACFLAGS)
 -LDLIBS = $(SDL_LDFLAGS) -lSDL -lSDL_mixer $(EXTRALDFLAGS) -Wl,-E
-+CFLAGS = -g -O2 -W -Wall -Wno-unused -Wno-pointer-sign
-+ALL_CFLAGS = $(SDL_CFLAGS) -DUSE_SDL=1 -DPLATFORM_UNIX=1 $(EXTRACFLAGS) -DDATADIR=\"/usr/share/games/rott/\" $(CFLAGS)
-+LDFLAGS = -Wl,-E
++CFLAGS += -g -W -Wall -Wno-unused -Wno-pointer-sign
++ALL_CFLAGS = $(SDL_CFLAGS) -DUSE_SDL=1 -DPLATFORM_UNIX=1 $(CFLAGS) $(EXTRACFLAGS)
++LDFLAGS += -Wl,-E
 +LDLIBS = $(LDFLAGS) $(SDL_LDFLAGS) -lSDL -lSDL_mixer $(EXTRALDFLAGS)
 +
 +%.o: %.c
@@ -24,10 +22,8 @@
  
  rott: 	\
  	cin_actr.o \
-Index: rott-1.0+dfsg/_rt_ted.h
-===================================================================
---- rott-1.0+dfsg.orig/_rt_ted.h	2008-04-22 16:19:35.000000000 +0200
-+++ rott-1.0+dfsg/_rt_ted.h	2008-04-22 16:19:36.000000000 +0200
+--- rott-1.0+dfsg.orig/_rt_ted.h
++++ rott-1.0+dfsg/_rt_ted.h
 @@ -85,17 +85,17 @@
  #define  MAXSILLYSTRINGS 32
  
@@ -52,22 +48,9 @@
  #endif
  
  
-Index: rott-1.0+dfsg/rt_main.c
-===================================================================
---- rott-1.0+dfsg.orig/rt_main.c	2008-04-22 16:19:36.000000000 +0200
-+++ rott-1.0+dfsg/rt_main.c	2008-04-22 16:19:36.000000000 +0200
-@@ -88,6 +88,10 @@
- //MED
- #include "memcheck.h"
- 
-+#ifndef DATADIR
-+#define DATADIR	("")
-+#endif
-+
- volatile int    oldtime;
- volatile int    gametime;
- 
-@@ -968,9 +972,9 @@
+--- rott-1.0+dfsg.orig/rt_main.c
++++ rott-1.0+dfsg/rt_main.c
+@@ -968,9 +968,9 @@
     // Normal ROTT wads
  
  #if (SHAREWARE)
@@ -79,7 +62,7 @@
  #endif
  
  //   newargs [argnum++] = "credits.wad";
-@@ -990,7 +994,7 @@
+@@ -990,7 +990,7 @@
        }
     else
        {
@@ -88,3 +71,16 @@
        }
  
     newargs [argnum++] = NULL;
+--- rott-1.0+dfsg.orig/rt_def.h
++++ rott-1.0+dfsg/rt_def.h
+@@ -84,6 +84,10 @@
+ //
+ //***************************************************************************
+ 
++#ifndef DATADIR
++#define DATADIR	""
++#endif
++
+ #undef PI
+ #undef M_PI
+ 

Modified: packages/trunk/rott/debian/rules
===================================================================
--- packages/trunk/rott/debian/rules	2008-05-15 08:44:04 UTC (rev 7028)
+++ packages/trunk/rott/debian/rules	2008-05-15 09:16:02 UTC (rev 7029)
@@ -4,6 +4,8 @@
 include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
+CFLAGS += -DDATADIR=\\\"/usr/share/games/rott/\\\"
+
 get-orig-source:
 	wget http://icculus.org/rott/releases/rott-1.0.tar.gz
 	tar xvzf rott-1.0.tar.gz