1 |
grozin 10/10/02 07:58:21 |
2 |
|
3 |
Added: fotoxx-10.10-makefile.patch |
4 |
Removed: fotoxx-makefile.patch |
5 |
Log: |
6 |
Version bump |
7 |
|
8 |
(Portage version: 2.2_rc88/cvs/Linux i686) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 media-gfx/fotoxx/files/fotoxx-10.10-makefile.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/fotoxx/files/fotoxx-10.10-makefile.patch?rev=1.1&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/fotoxx/files/fotoxx-10.10-makefile.patch?rev=1.1&content-type=text/plain |
15 |
|
16 |
Index: fotoxx-10.10-makefile.patch |
17 |
=================================================================== |
18 |
diff -U1 -r fotoxx-10.9.1.orig//Makefile fotoxx-10.9.1//Makefile |
19 |
--- fotoxx-10.9.1.orig//Makefile 2010-09-09 18:12:15.000000000 +0700 |
20 |
+++ fotoxx-10.9.1//Makefile 2010-09-15 06:25:29.000000000 +0700 |
21 |
@@ -7,8 +7,8 @@ |
22 |
# defaults for parameters that may be pre-defined |
23 |
-CXXFLAGS ?= -O3 -g -Wall |
24 |
-LDFLAGS ?= -O3 -g -Wall -rdynamic |
25 |
+CXXFLAGS += -Wall |
26 |
+LDFLAGS += -rdynamic |
27 |
PREFIX ?= /usr/local |
28 |
|
29 |
-CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-2.0` |
30 |
-LFLAGS = $(LDFLAGS) `pkg-config --libs gtk+-2.0 gthread-2.0` |
31 |
+CXXFLAGS += -c `pkg-config --cflags gtk+-2.0` |
32 |
+LIBS = `pkg-config --libs gtk+-2.0 gthread-2.0` |
33 |
|
34 |
@@ -16,3 +16,3 @@ |
35 |
DATADIR = $(PREFIX)/share/$(PROGRAM) |
36 |
-DOCDIR = $(PREFIX)/share/doc/$(PROGRAM) |
37 |
+DOCDIR = $(PREFIX)/share/doc/$(PF) |
38 |
MANDIR = $(PREFIX)/share/man/man1 |
39 |
@@ -23,6 +23,6 @@ |
40 |
@ ./dependencies.sh |
41 |
- $(CXX) $(LFLAGS) -ltiff -o $(PROGRAM) $(PROGRAM).o zfuncs.o |
42 |
+ $(CXX) $(LDFLAGS) -o $(PROGRAM) $(PROGRAM).o zfuncs.o -ltiff $(LIBS) |
43 |
|
44 |
$(PROGRAM).o: $(SOURCE) |
45 |
- $(CXX) $(CFLAGS) -o $(PROGRAM).o $(SOURCE) \ |
46 |
+ $(CXX) $(CXXFLAGS) -o $(PROGRAM).o $(SOURCE) \ |
47 |
-D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" |
48 |
@@ -30,3 +30,3 @@ |
49 |
zfuncs.o: zfuncs.cc |
50 |
- $(CXX) $(CFLAGS) zfuncs.cc \ |
51 |
+ $(CXX) $(CXXFLAGS) zfuncs.cc \ |
52 |
-D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" -D "BINDIR=\"$(BINDIR)\"" |