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
37
38
39
40
|
diff -r -U1 fotoxx-13.03.orig/Makefile fotoxx-13.03/Makefile
--- fotoxx-13.03.orig/Makefile 2013-03-01 13:33:56.000000000 +0700
+++ fotoxx-13.03/Makefile 2013-03-22 12:47:39.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 -Wno-deprecated-declarations
+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,4 +19,4 @@
-CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-3.0`
-LIBS = `pkg-config --libs gtk+-3.0`
+CFLAGS = $(CXXFLAGS) -c -DPF=\"$(PF)\" `pkg-config --cflags gtk+-3.0`
+LIBS = `pkg-config --libs gtk+-3.0` -lpthread
@@ -84,5 +84,2 @@
rm -f fotoxx.1.gz
- # menu (desktop) file
- cp -f desktop $(DESTDIR)$(MENUFILE)
- xdg-desktop-menu install $(DESTDIR)$(MENUFILE)
@@ -93,3 +90,2 @@
rm -f $(DESTDIR)$(MANDIR)/fotoxx.1.gz
- xdg-desktop-menu uninstall $(DESTDIR)$(MENUFILE)
rm -f $(DESTDIR)$(MENUFILE)
diff -r -U1 fotoxx-13.03.orig/zfuncs.cc fotoxx-13.03/zfuncs.cc
--- fotoxx-13.03.orig/zfuncs.cc 2013-03-01 13:33:56.000000000 +0700
+++ fotoxx-13.03/zfuncs.cc 2013-03-22 12:46:16.000000000 +0700
@@ -3917,3 +3917,3 @@
strncatv(zlocalesdir,199,work,"/share/",zappname,"/locales",null); // /prefix/share/appname/locales
- strncatv(zdocdir,199,work,"/share/doc/",zappname,null); // /prefix/share/doc/appname
+ strncatv(zdocdir,199,work,"/share/doc/",PF,null); // /prefix/share/doc/$(PF)
|
GitWeb
