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
41
42
43
44
45
46
47
48
49
50
|
diff -r -U1 fotoxx-14.08.orig/Makefile fotoxx-14.08/Makefile
--- fotoxx-14.08.orig/Makefile 2014-08-01 18:26:48.000000000 +0700
+++ fotoxx-14.08/Makefile 2014-08-03 16:11:40.201653715 +0700
@@ -5,5 +5,4 @@
# defaults for parameters that may be pre-defined
-CXXFLAGS ?= -O2 -Wall -ggdb
-
-LDFLAGS ?= -rdynamic
+CXXFLAGS += -Wall
+LDFLAGS += -rdynamic
PREFIX ?= /usr
@@ -16,3 +15,3 @@
LOCALESDIR = $(SHAREDIR)/locales
-DOCDIR = $(PREFIX)/share/doc/fotoxx
+DOCDIR = $(PREFIX)/share/doc/$(PF)
MANDIR = $(PREFIX)/share/man/man1
@@ -21,4 +20,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
@@ -73,3 +72,2 @@
rm -f $(DESTDIR)$(MANDIR)/fotoxx.1.gz
- xdg-desktop-menu uninstall $(DESTDIR)$(MENUFILE)
rm -f $(DESTDIR)$(MENUFILE)
@@ -80,2 +78,3 @@
mkdir -p $(DESTDIR)$(DOCDIR)
+ mkdir -p $(DESTDIR)$(APPDATADIR)
mkdir -p $(DESTDIR)$(MANDIR)
@@ -94,6 +93,2 @@
rm -f fotoxx.1.gz
- # menu (desktop) file
- cp -f desktop $(DESTDIR)$(MENUFILE)
- # chmod +x $(DESTDIR)$(MENUFILE)
- xdg-desktop-menu install --novendor $(DESTDIR)$(MENUFILE)
@@ -104,3 +99,2 @@
rm -f $(DESTDIR)$(MANDIR)/fotoxx.1.gz
- xdg-desktop-menu uninstall $(DESTDIR)$(MENUFILE)
rm -f $(DESTDIR)$(MENUFILE)
diff -r -U1 fotoxx-14.08.orig/zfuncs.cc fotoxx-14.08/zfuncs.cc
--- fotoxx-14.08.orig/zfuncs.cc 2014-08-01 18:26:48.000000000 +0700
+++ fotoxx-14.08/zfuncs.cc 2014-08-03 16:13:01.706650287 +0700
@@ -3973,3 +3973,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
