SOURCES (DEVEL): tome-makefile.patch - works with 3.0.0alpha17 ver...

[lisu]

Author: lisu                         Date: Fri Oct 26 15:25:57 2007 GMT
Module: SOURCES                       Tag: DEVEL
---- Log message:
- works with 3.0.0alpha17 version

---- Files affected:
SOURCES:
   tome-makefile.patch (1.6 -> 1.6.2.1) 

---- Diffs:

================================================================
Index: SOURCES/tome-makefile.patch
diff -u SOURCES/tome-makefile.patch:1.6 SOURCES/tome-makefile.patch:1.6.2.1
--- SOURCES/tome-makefile.patch:1.6	Tue Jan 16 18:20:41 2007
+++ SOURCES/tome-makefile.patch	Fri Oct 26 17:25:51 2007
@@ -1,41 +1,36 @@
---- tome-210-src-org/src/makefile.std	Mon Nov 25 00:42:24 2002
-+++ tome-210-src/src/makefile.std	Sun Dec 15 14:03:28 2002
-@@ -77,17 +77,17 @@
- ##
+--- tome-300alpha17-src/src/makefile.std~	2007-10-25 22:43:34.000000000 +0200
++++ tome-300alpha17-src/src/makefile.std	2007-10-25 22:43:14.000000000 +0200
+@@ -30,9 +30,9 @@
+ # tome.cfg needs editing to point to the correct location
  
- # Where lib/ files goes
--#LIBDIR = /usr/lib/games/tome/
-+LIBDIR = /usr/share/games/tome/
+ # Where lib/ and tome.cfg files goes
+-LIBDIR = $(PREFIX)/games/$(TOMENAME)/
++#LIBDIR = $(PREFIX)/games/$(TOMENAME)/
  # Sysadmins of commercial Unix and/or BSD might prefer this
- #LIBDIR = /usr/local/lib/tome/
- # If you like the old default, use this one
--LIBDIR = ./lib/
-+#LIBDIR = ./lib/
+-#LIBDIR = $(PREFIX)/share/$(TOMENAME)/
++LIBDIR = $(PREFIX)/share/games/$(TOMENAME)/
  # Another example: single user installation using absolute path
- #LIBDIR = /home/myloginname/lib/tome/
- 
- 
- # Where ToME binary goes
--BINDIR = /usr/local/games
-+BINDIR = /usr/games
- # Another common location
- #BINDIR = /usr/local/bin
- 
-@@ -152,13 +152,6 @@
+ #LIBDIR = /home/myloginname/lib/$(TOMENAME)/
+ # If none are defined then tome will look for tome.cfg in the same
+@@ -106,17 +106,6 @@
  # including "USE_GETCH" and "USE_CURS_SET".  Note that "config.h" will
  # attempt to "guess" at many of these flags based on your system.
  #
 -COPTS = -Wall -O1 -pipe -g
--INCLUDES = -I/usr/X11R6/include
+-INCLUDES = -I$(X11BASE)/include
 -DEFINES = -DUSE_X11 \
--	-DUSE_EGO_GRAPHICS -DUSE_TRANSPARENCY -DSUPPORT_GAMMA \
--	-DUSE_PRECISE_CMOVIE -DUSE_UNIXSOCK
--LIBS = -L/usr/X11R6/lib -lX11
+-	-DUSE_GCU \
+-	-DUSE_EGO_GRAPHICS \
+-	-DUSE_TRANSPARENCY \
+-	-DSUPPORT_GAMMA \
+-	-DUSE_PRECISE_CMOVIE \
+-	-DUSE_UNIXSOCK
+-LIBS = -lcurses -L$(X11BASE)/lib -lX11
 -
+ 
  ##
- ## Variation -- Only support "main-gtk.c" (not "main-gcu.c, main-x11.c")
- ##
-@@ -176,10 +176,10 @@
+ ## Variation -- Use "main-sdl.c" instead of "main-x11.c"
+@@ -153,10 +142,10 @@
  ##
  ## Variation -- Only support "main-gcu.c" (not "main-x11.c")
  ##
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/tome-makefile.patch?r1=1.6&r2=1.6.2.1&f=u