patches/zgv-02-config.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 361 c08fbbb2cbb1
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
361
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
     1
--- zgv-5.9/config.mk.orig	2007-07-30 08:51:55.859285387 +0700
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
     2
+++ zgv-5.9/config.mk	2007-07-30 08:52:44.113938239 +0700
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
     3
@@ -7,8 +7,8 @@
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
     4
 # Set the C compiler to use, and options for it.
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
     5
 # This is likely to be what you'll want for most systems:
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
     6
 #
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
     7
-CC=gcc
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
     8
-CFLAGS=-O2 -Wall -fomit-frame-pointer -finline-functions
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
     9
+CC?=gcc
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    10
+CFLAGS?=-O2 -Wall -fomit-frame-pointer -finline-functions
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    11
 #
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    12
 # If you're brave enough to try compiling zgv on a non-x86 system :-),
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    13
 # this might be a better bet:
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    14
@@ -20,13 +20,13 @@
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    15
 # (This should be a `new' awk, such as gawk or mawk.) This setting
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    16
 # should work for Linux and *BSD.
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    17
 #
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    18
-AWK=awk
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    19
+AWK?=awk
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    20
 
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    21
 # Set display backend to use. svgalib is the `native' one and
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    22
 # is likely to remain preferable. The SDL backend is now quite
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    23
 # usable, but tends to be rather slower.
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    24
 #
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    25
-BACKEND=SVGALIB
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    26
+BACKEND?=SVGALIB
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    27
 #BACKEND=SDL
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    28
 
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    29
 
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    30
@@ -37,7 +37,7 @@
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    31
 # MANDIR to directory for man page.
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    32
 # Usually it will be simpler to just set PREFIX.
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    33
 #
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    34
-PREFIX=/usr/local
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    35
+PREFIX?=/usr/local
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    36
 
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    37
 # In theory it would be nice to put the info file and man page under
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    38
 # /usr/local/share. However, it's not clear if this is widely
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    39
@@ -59,7 +59,7 @@
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    40
 # Set the location/filename of the system-wide configuration file. You
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    41
 # may prefer to have this under /etc, for example.
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    42
 #
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    43
-RCFILE=$(PREFIX)/etc/zgv.conf
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    44
+RCFILE?=$(PREFIX)/etc/zgv.conf
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    45
 
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    46
 
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    47
 # Normally `make install' will update your `dir' file (in INFODIR),
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    48
@@ -91,7 +91,7 @@
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    49
 # colours will be recognised, which will mean many XPMs won't be
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    50
 # readable. This setting should be ok.
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    51
 #
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    52
-RGB_DB=/usr/X11R6/lib/X11/rgb.txt
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    53
+RGB_DB?=/usr/X11R6/lib/X11/rgb.txt
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    54
 
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    55
 # Finally, an option for `make dvi' in the `doc' directory. You only need
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    56
 # worry about what this is set to if you plan to make a printed manual.
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    57
@@ -102,4 +102,4 @@
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    58
 # edit this file when you do `make dvi', but that's only because
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    59
 # doc/Makefile isn't as smart about that as it should be. :-))
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    60
 #
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    61
-USE_A4_DEF=-t @afourpaper
c08fbbb2cbb1 2007-07-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    62
+USE_A4_DEF?=-t @afourpaper