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
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
|
--- a./Makefile
+++ b./Makefile
@@ -72,7 +72,7 @@ endif
# <HOSTROOT> is the directory containing support files for building for <HOST>:
# <HOSTROOT>/include Header files.
# <HOSTROOT>/lib Library files.
-# <HOSTROOT>/lib/pkgconfig *.pc files.
+# <HOSTROOT>/$(LIBDIR)/pkgconfig *.pc files.
#
ifdef HOST
ifdef HOSTROOT
@@ -103,7 +103,7 @@ ifdef HOST
# We set PKG_CONFIG_LIBDIR instead of PKG_CONFIG_PATH because we want to
# *change* where pkg-config looks for .pc files instead of adding to the
# default path which may have libraries that aren't for HOST.
- export PKG_CONFIG_LIBDIR:=$(HOSTROOT)/lib/pkgconfig
+ export PKG_CONFIG_LIBDIR:=$(HOSTROOT)/$(LIBDIR)/pkgconfig
endif
endif
@@ -169,7 +169,7 @@ windows_ARCH_CFLAGS:=
macos_ARCH_CFLAGS:=-isysroot $(SDKROOT) -I$(SDKROOT)/usr/include -I$(HOSTROOT)/include -mmacosx-version-min=$(MINVER) -arch $(subst $() $(), -arch ,$(ARCHS)) -w -headerpad_max_install_names -DHAVE_STRCASESTR
ios_ARCH_CFLAGS:=-isysroot $(SDKROOT) -I$(SDKROOT)/usr/include -I$(HOSTROOT)/include $(MINVEROPT) -arch $(subst $() $(), -arch ,$(ARCHS)) -w -fPIC -DHAVE_STRCASESTR -DUNLINK_ONLY
beos_ARCH_CFLAGS:=
-linux_ARCH_CFLAGS:=
+linux_ARCH_CFLAGS:= ${CFLAGS}
ARCH_CFLAGS:=$($(OS)_ARCH_CFLAGS)
windows_ARCH_LDFLAGS:=
@@ -205,7 +205,7 @@ ARCH_HEADERS:=$($(OS)_ARCH_HEADERS)
windows_PREFIX:=/usr/local
macos_PREFIX:=Resources
ios_PREFIX:=.
-linux_PREFIX:=/usr/local
+linux_PREFIX:=/usr
PREFIX:=$($(OS)_PREFIX)
# Root directory to place files when creating packages.
@@ -243,7 +243,7 @@ MAGIC_PREFIX:=$(DESTDIR)$(LIBDIR)/lib$(LIBDIRSUFFIX)/tuxpaint/plugins
# Docs and man page:
DOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint-$(VER_VERSION)
-DEVDOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint-$(VER_VERSION)/tuxpaint-dev
+DEVDOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/${PF}/tuxpaint-dev
MAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man
DEVMAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man
@@ -545,7 +545,7 @@ trans:
windows_ARCH_INSTALL:=install-dlls install-tpconf-i18n
macos_ARCH_INSTALL:=install-macbundle TuxPaint.dmg install-man install-importscript install-bash-completion
ios_ARCH_INSTALL:=install-iosbundle install-man install-importscript install-bash-completion
-linux_ARCH_INSTALL:=install-xdg install-man install-importscript install-bash-completion
+linux_ARCH_INSTALL:= install-man install-importscript install-bash-completion
ARCH_INSTALL:=$($(OS)_ARCH_INSTALL)
# "make install" installs all of the various parts
@@ -693,12 +693,12 @@ uninstall: uninstall-i18n
-rm $(BIN_PREFIX)/tuxpaint-import
-rm -r $(DATA_PREFIX)
-rm -r $(DOC_PREFIX)
- -rm $(MAN_PREFIX)/man1/tuxpaint.1.gz
- -rm $(MAN_PREFIX)/*/man1/tuxpaint.1.gz
- -rm $(MAN_PREFIX)/man1/tuxpaint-import.1.gz
- -rm $(MAN_PREFIX)/*/man1/tuxpaint-import.1.gz
- -rm $(MAN_PREFIX)/man1/tp-magic-config.1.gz
- -rm $(MAN_PREFIX)/*/man1/tp-magic-config.1.gz
+ -rm $(MAN_PREFIX)/man1/tuxpaint.1
+ -rm $(MAN_PREFIX)/*/man1/tuxpaint.1
+ -rm $(MAN_PREFIX)/man1/tuxpaint-import.1
+ -rm $(MAN_PREFIX)/*/man1/tuxpaint-import.1
+ -rm $(MAN_PREFIX)/man1/tp-magic-config.1
+ -rm $(MAN_PREFIX)/*/man1/tp-magic-config.1
-rm -f -r $(CONFDIR)
-rm $(COMPLETIONDIR)/tuxpaint-completion.bash
-rm -r $(MAGIC_PREFIX)
@@ -962,9 +962,9 @@ install-dlls:
@cp -R win32/etc/ $(BIN_PREFIX)
@echo
@echo "...Installing Library Modules..."
- @mkdir -p $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders
- @cp $(MINGW_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders
- @strip -s $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll
+ @mkdir -p $(BIN_PREFIX)/$(LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders
+ @cp $(MINGW_DIR)/$(LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/$(LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders
+ @strip -s $(BIN_PREFIX)/$(LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders/*.dll
# Install symlink:
.PHONY: install-haiku
@@ -1039,24 +1039,20 @@ install-man:
@install -d $(MAN_PREFIX)/man1
@# tuxpaint.1
@cp man/en/tuxpaint.1 $(MAN_PREFIX)/man1/
- @gzip -f $(MAN_PREFIX)/man1/tuxpaint.1
- @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint.1.gz
+ @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint.1
@# tuxpaint-import.1
@cp man/en/tuxpaint-import.1 $(MAN_PREFIX)/man1/
- @gzip -f $(MAN_PREFIX)/man1/tuxpaint-import.1
- @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint-import.1.gz
+ @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint-import.1
@# tp-magic-config.1
@cp man/en/tp-magic-config.1 $(MAN_PREFIX)/man1/
- @gzip -f $(MAN_PREFIX)/man1/tp-magic-config.1
- @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tp-magic-config.1.gz
+ @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tp-magic-config.1
@echo
for l in `ls -d man/*.UTF-8 | cut -d '/' -f 2`; do \
DEST=$(MAN_PREFIX)/$$l/man1 ; \
echo "...Installing $$l man pages into $$DEST..." ; \
install -d $$DEST ; \
cp man/$$l/tuxpaint.1 $$DEST ; \
- gzip -f $$DEST/tuxpaint.1 ; \
- chmod a+rx,g-w,o-w $$DEST/tuxpaint.1.gz ; \
+ chmod a+rx,g-w,o-w $$DEST/tuxpaint.1 ; \
done
@# FIXME: The other man pages aren't localizable yet -bjk 2021.08.14
|
