Root/zgv/patches/010-Makefile.patch

1Index: zgv-5.9/config.mk
2===================================================================
3--- zgv-5.9.orig/config.mk 2011-01-22 20:49:48.000000000 +0100
4+++ zgv-5.9/config.mk 2011-01-23 12:45:27.000000000 +0100
5@@ -7,8 +7,8 @@
6 # Set the C compiler to use, and options for it.
7 # This is likely to be what you'll want for most systems:
8 #
9-CC=gcc
10-CFLAGS=-O2 -Wall -fomit-frame-pointer -finline-functions
11+#CC=gcc
12+#CFLAGS=-O2 -Wall -fomit-frame-pointer -finline-functions
13 #
14 # If you're brave enough to try compiling zgv on a non-x86 system :-),
15 # this might be a better bet:
16@@ -37,7 +37,7 @@
17 # MANDIR to directory for man page.
18 # Usually it will be simpler to just set PREFIX.
19 #
20-PREFIX=/usr/local
21+PREFIX=/usr/
22 
23 # In theory it would be nice to put the info file and man page under
24 # /usr/local/share. However, it's not clear if this is widely
25@@ -59,7 +59,7 @@
26 # Set the location/filename of the system-wide configuration file. You
27 # may prefer to have this under /etc, for example.
28 #
29-RCFILE=$(PREFIX)/etc/zgv.conf
30+RCFILE=/etc/zgv.conf
31 
32 
33 # Normally `make install' will update your `dir' file (in INFODIR),
34Index: zgv-5.9/src/Makefile
35===================================================================
36--- zgv-5.9.orig/src/Makefile 2011-01-23 12:43:07.000000000 +0100
37+++ zgv-5.9/src/Makefile 2011-01-23 12:53:52.000000000 +0100
38@@ -13,8 +13,8 @@
39 # having /usr/local/{include,lib} like this is apparently needed for
40 # FreeBSD, but shouldn't cause problems on Linux.
41 #
42-CFLAGS+=-I/usr/local/include
43-ZGV_LIBS=-L/usr/local/lib
44+#CFLAGS+=-I/usr/local/include
45+#ZGV_LIBS=-L/usr/local/lib
46 
47 CFLAGS+=-DBACKEND_$(BACKEND)
48 
49@@ -47,7 +47,7 @@
50     modesel.o readpcd.o readtiff.o readprf.o zgv_io.o
51 
52 zgv: $(ZGV_OBJS)
53- $(CC) $(CFLAGS) -o zgv $(ZGV_OBJS) $(ZGV_LIBS)
54+ $(CC) $(LDFLAGS) $(CFLAGS) -o zgv $(ZGV_OBJS) $(ZGV_LIBS)
55 
56 bdf2h: bdf2h.o
57     $(CC) $(CFLAGS) -o bdf2h bdf2h.o
58@@ -134,10 +134,10 @@
59     ../fonts/helvR12.bdf \
60     ../fonts/helvB12.bdf \
61     ../fonts/helvR18.bdf
62- ./bdf2h 0 <../fonts/timI12.bdf >fontbmps.h
63- ./bdf2h 1 <../fonts/helvR08.bdf >>fontbmps.h
64- ./bdf2h 2 <../fonts/helvR12.bdf >>fontbmps.h
65- ./bdf2h 2b <../fonts/helvB12.bdf >>fontbmps.h
66- ./bdf2h 3 <../fonts/helvR18.bdf >>fontbmps.h
67+ zgv-bdf2h 0 <../fonts/timI12.bdf >fontbmps.h
68+ zgv-bdf2h 1 <../fonts/helvR08.bdf >>fontbmps.h
69+ zgv-bdf2h 2 <../fonts/helvR12.bdf >>fontbmps.h
70+ zgv-bdf2h 2b <../fonts/helvB12.bdf >>fontbmps.h
71+ zgv-bdf2h 3 <../fonts/helvR18.bdf >>fontbmps.h
72 rcfile_opt.h rcfile_var.h rcfile_short.h: options.src mkopts.awk
73     $(AWK) -f mkopts.awk <options.src
74

Archive Download this file



interactive