r2872 - in packages/trunk/vodovod/debian: . patches

[Miriam Ruiz]

Author: baby-guest
Date: 2007-06-07 18:48:11 +0000 (Thu, 07 Jun 2007)
New Revision: 2872

Added:
   packages/trunk/vodovod/debian/patches/datadir_makefile.patch
Modified:
   packages/trunk/vodovod/debian/patches/datadir.patch
   packages/trunk/vodovod/debian/patches/series
   packages/trunk/vodovod/debian/patches/user_files.patch
   packages/trunk/vodovod/debian/rules
Log:
Fixed patches



Modified: packages/trunk/vodovod/debian/patches/datadir.patch
===================================================================
--- packages/trunk/vodovod/debian/patches/datadir.patch	2007-06-07 18:35:19 UTC (rev 2871)
+++ packages/trunk/vodovod/debian/patches/datadir.patch	2007-06-07 18:48:11 UTC (rev 2872)
@@ -24,7 +24,7 @@
  #ifndef MB_RESOURCE_H
  #define MB_RESOURCE_H
  
-+#ifndef DATADUR
++#ifndef DATADIR
 +#define DATADIR "."
 +#endif
 +

Added: packages/trunk/vodovod/debian/patches/datadir_makefile.patch
===================================================================
--- packages/trunk/vodovod/debian/patches/datadir_makefile.patch	                        (rev 0)
+++ packages/trunk/vodovod/debian/patches/datadir_makefile.patch	2007-06-07 18:48:11 UTC (rev 2872)
@@ -0,0 +1,19 @@
+--- vodovod-1.05.orig/Makefile
++++ vodovod-1.05/Makefile
+@@ -23,13 +23,15 @@
+ PREFIX=/usr
+ endif
+ 
++DATADIR?=.
++
+ PROGRAM = vodovod
+ OBJECTS = game.o map.o resource.o main.o allmenus.o njamfont.o sutils.o menu.o hiscore.o effects.o config.o keys.o
+ CC = g++
+ 
+ # If you hate warnings under Cygwin use these flags instead
+ # MY_CFLAGS = -I/usr/local/include/SDL -Dmain=SDL_main -DWIN32 -Uunix -mno-cygwin
+-MY_CFLAGS = `sdl-config --cflags`
++MY_CFLAGS = `sdl-config --cflags` -DDATADIR=\"$(DATADIR)\"
+ 
+ %.o:	%.cpp
+ 	$(CC) -c $(MY_CFLAGS) $< -o $@

Modified: packages/trunk/vodovod/debian/patches/series
===================================================================
--- packages/trunk/vodovod/debian/patches/series	2007-06-07 18:35:19 UTC (rev 2871)
+++ packages/trunk/vodovod/debian/patches/series	2007-06-07 18:48:11 UTC (rev 2872)
@@ -1,2 +1,3 @@
 datadir.patch
 user_files.patch
+datadir_makefile.patch

Modified: packages/trunk/vodovod/debian/patches/user_files.patch
===================================================================
--- packages/trunk/vodovod/debian/patches/user_files.patch	2007-06-07 18:35:19 UTC (rev 2871)
+++ packages/trunk/vodovod/debian/patches/user_files.patch	2007-06-07 18:48:11 UTC (rev 2872)
@@ -24,7 +24,7 @@
 +        snprintf(vodovod_conf, sizeof(vodovod_conf), "%s/.vodovod", home);
 +        mkdir(vodovod_conf, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
 +    }
-+    strncat(vodovod_conf, "vodovod.conf", sizeof(vodovod_conf));
++    strncat(vodovod_conf, "/vodovod.conf", sizeof(vodovod_conf));
 +#endif
 +
 +    std::ofstream file(vodovod_conf);
@@ -74,7 +74,7 @@
 +        snprintf(hiscore_dat, sizeof(hiscore_dat), "%s/.vodovod", home);
 +        mkdir(hiscore_dat, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
 +    }
-+    strncat(hiscore_dat, "hiscore.dat", sizeof(hiscore_dat));
++    strncat(hiscore_dat, "/hiscore.dat", sizeof(hiscore_dat));
 +#endif
 +
      // save to file

Modified: packages/trunk/vodovod/debian/rules
===================================================================
--- packages/trunk/vodovod/debian/rules	2007-06-07 18:35:19 UTC (rev 2871)
+++ packages/trunk/vodovod/debian/rules	2007-06-07 18:48:11 UTC (rev 2872)
@@ -20,7 +20,7 @@
 build: build-stamp
 build-stamp: configure-stamp 
 	dh_testdir
-	$(MAKE)
+	$(MAKE) DATADIR=/usr/share/games/vodovod
 	#docbook-to-man debian/vodovod.sgml > vodovod.1
 	touch $@