summaryrefslogtreecommitdiff
blob: 325910bdce57d40f30dc1c1097473b229bfa01a9 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
diff -r -U1 fotoxx-11.09.orig/Makefile fotoxx-11.09/Makefile
--- fotoxx-11.09.orig/Makefile	2011-09-05 05:32:59.000000000 +0700
+++ fotoxx-11.09/Makefile	2011-09-22 18:20:29.000000000 +0700
@@ -5,4 +5,4 @@
 # defaults for parameters that may be pre-defined
-CXXFLAGS ?= -O3 -g -Wall
-LDFLAGS ?= -O3 -g -Wall -rdynamic
+CXXFLAGS += -Wall
+LDFLAGS += -rdynamic
 PREFIX ?= /usr
@@ -15,3 +15,3 @@
 LOCALESDIR = $(SHAREDIR)/locales
-DOCDIR = $(PREFIX)/share/doc/fotoxx
+DOCDIR = $(PREFIX)/share/doc/$(PF)
 MANDIR = $(PREFIX)/share/man/man1
@@ -19,3 +19,3 @@
 
-CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-2.0`
+CFLAGS = $(CXXFLAGS) -c -DPF=\"$(PF)\" `pkg-config --cflags gtk+-2.0`
 LIBS = `pkg-config --libs gtk+-2.0 gthread-2.0`
@@ -71,7 +71,2 @@
 	rm -f fotoxx.1.gz
-	# menu (desktop) file (absolute paths to get around rpmbuild problem)
-	cp -f data/desktop $(DESTDIR)$(MENUFILE)
-	echo Exec=/usr/bin/fotoxx >> $(DESTDIR)$(MENUFILE)
-	echo Icon=/usr/share/fotoxx/icons/fotoxx.png >> $(DESTDIR)$(MENUFILE)
-	xdg-desktop-menu install $(DESTDIR)$(MENUFILE)
 
diff -r -U1 fotoxx-11.09.orig/zfuncs.cc fotoxx-11.09/zfuncs.cc
--- fotoxx-11.09.orig/zfuncs.cc	2011-09-05 05:32:59.000000000 +0700
+++ fotoxx-11.09/zfuncs.cc	2011-09-22 18:14:46.000000000 +0700
@@ -3066,3 +3066,3 @@
    strncatv(zlocalesdir,199,work,"/share/",zappname,"/locales",null);      //  /installoc/share/appname/locales
-   strncatv(zdocdir,199,work,"/share/doc/",zappname,null);                 //  /installoc/share/doc/appname
+   strncatv(zdocdir,199,work,"/share/doc/",PF,null);                       //  /installoc/share/doc/appname