]>
Commit | Line | Data |
---|---|---|
3c4b3bfe JB |
1 | --- GTKstereograph-0.18b/GTKstereograph/gtkedit/gedialogs.c.orig 2001-12-17 00:05:39.000000000 +0100 |
2 | +++ GTKstereograph-0.18b/GTKstereograph/gtkedit/gedialogs.c 2004-04-26 23:42:47.923529677 +0200 | |
3 | @@ -24,8 +24,8 @@ | |
4 | ||
5 | void help_about_menu (GtkWidget *widget) | |
6 | { | |
7 | - display_dialog("About ...",NAME " - gtk editor\n | |
8 | -ge comes with ABSOLUTELY NO WARRANTY - see GPL."); | |
9 | + display_dialog("About ...",NAME " - gtk editor\n" | |
10 | +"ge comes with ABSOLUTELY NO WARRANTY - see GPL."); | |
11 | } | |
12 | ||
13 | void message () | |
14 | --- GTKstereograph-0.18b/GTKstereograph/gtkedit/Makefile.orig 2003-11-09 23:25:16.000000000 +0100 | |
15 | +++ GTKstereograph-0.18b/GTKstereograph/gtkedit/Makefile 2004-04-26 23:44:24.288249249 +0200 | |
16 | @@ -11,7 +11,7 @@ | |
17 | #DEBUG = -g -DDEBUG | |
18 | ||
19 | #CFLAGS = -DNAME=\"$(NAME)\" $(DEBUG) -Wall -O2 -fno-strength-reduce -falign-loops -ffast-math -fexpensive-optimizations | |
20 | -CFLAGS = -DNAME=\"$(NAME)\" $(DEBUG) -Wall -O2 -fno-strength-reduce -ffast-math -fexpensive-optimizations | |
21 | +CFLAGS = -DNAME=\"$(NAME)\" $(DEBUG) -Wall $(OPT) -fno-strength-reduce -ffast-math | |
22 | ||
23 | #all: init $(PROG) $(LIBSO) $(LIBA) | |
24 | all: $(LIBA) | |
25 | --- GTKstereograph-0.18b/GTKstereograph/Makefile.am.orig 2003-11-08 07:30:44.000000000 +0100 | |
26 | +++ GTKstereograph-0.18b/GTKstereograph/Makefile.am 2004-04-26 23:44:49.484162144 +0200 | |
27 | @@ -14,7 +14,7 @@ | |
28 | gfxio.c gfxio.h | |
29 | ||
30 | GTKstereograph_LDADD = \ | |
31 | - gtkedit/libgtkedit.a /usr/lib/libjpeg.so /usr/lib/libpng.so /usr/lib/libz.so @GTK_LIBS@ | |
32 | + gtkedit/libgtkedit.a -ljpeg -lpng -lz @GTK_LIBS@ | |
33 | ||
34 | SUBDIRS = \ | |
35 | gtkedit | |
36 | --- GTKstereograph-0.18b/stereograph/Makefile.orig 2003-11-17 22:29:44.000000000 +0100 | |
37 | +++ GTKstereograph-0.18b/stereograph/Makefile 2004-04-26 23:45:49.821584977 +0200 | |
38 | @@ -11,13 +11,13 @@ | |
39 | # please correct the LDFAGS down there. | |
40 | # | |
41 | ||
42 | -#PREFIX=/usr/local | |
43 | -PREFIX=`grep -i "prefix =" ../Makefile | grep -i -v exec | cut -d"=" -f 2` | |
44 | +PREFIX=/usr | |
45 | ||
46 | # Linux | |
47 | CC = gcc | |
48 | -CFLAGS = -Wall -O2 -Dlinux -DX11GUI | |
49 | -LDFLAGS = -ljpeg -lpng -lz -lm -lX11 -ldl -rdynamic -L/usr/X11R6/lib | |
50 | +CFLAGS = -Wall $(OPT) -Dlinux -DX11GUI | |
51 | +LXLIBS = -L/usr/X11R6/lib | |
52 | +LDFLAGS = -ljpeg -lpng -lz -lm -lX11 -ldl -rdynamic $(LXLIBS) | |
53 | ||
54 | # HPUX | |
55 | #CC = cc | |
56 | --- GTKstereograph-0.18b/stereograph/Makefile.in.orig 2003-11-09 16:33:17.000000000 +0100 | |
57 | +++ GTKstereograph-0.18b/stereograph/Makefile.in 2004-04-26 23:53:57.142841908 +0200 | |
58 | @@ -14,8 +14,9 @@ | |
59 | ||
60 | ||
61 | install: | |
62 | - cp stereograph $(PREFIX)/bin/stereograph | |
63 | - cp stereograph.1 $(PREFIX)/man/man1/stereograph.1 | |
64 | + install -d $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/share/man/man1 | |
65 | + cp stereograph $(DESTDIR)$(PREFIX)/bin/stereograph | |
66 | + cp stereograph.1 $(DESTDIR)$(PREFIX)/share/man/man1/stereograph.1 | |
67 | ||
68 | clean: | |
69 | rm -f $(OBJ0) *~ stereograph core |