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
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
|
--- engines/togaII1.2.1a/src/Makefile.old
+++ engines/togaII1.2.1a/src/Makefile
@@ -18,23 +18,16 @@
# general
-CXX = g++
-CXXFLAGS = -pipe -Wall
-LDFLAGS = -lm
# C++
-CXXFLAGS += -fno-exceptions -fno-rtti
# optimisation
-CXXFLAGS += -O3 -fstrict-aliasing
-CXXFLAGS += -fomit-frame-pointer
# CXXFLAGS += -march=athlon-xp # SELECT ME
# strip
-LDFLAGS += -s
# dependencies
--- tcl/utils/sound.tcl.old
+++ tcl/utils/sound.tcl
@@ -41,7 +41,7 @@
variable soundFolder
::splash::add "Setting up audio move announcement..."
- if {[catch {package require snack 2.0}]} {
+ if {[catch {package require snack}]} {
set hasSnackPackage 0
::splash::add " Move speech disabled - Snack sound package not found"
return
--- Makefile.conf.old
+++ Makefile.conf
@@ -193,7 +193,7 @@
# Small extra programs. Most are written in Tcl using tkscid, but
# a few contributed ones may be in Python or other languages.
#
-SCRIPTS= sc_addmove sc_epgn sc_spell sc_eco sc_import sc_remote sc_tree scidpgn pgnfix spliteco spf2spi
+SCRIPTS= sc_addmove sc_epgn sc_spell sc_eco sc_import sc_remote sc_tree scidpgn pgnfix eco2pgn spliteco spf2spi
####################
@@ -218,25 +218,25 @@
install: $(INSTALL)
install_scid: all_scid
- install -m 755 -d $(SHAREDIR)
- install -m 755 -d $(BINDIR)
- install -m 755 scid $(SCRIPTS) $(EXECS) $(BINDIR)
- install -m 644 -p scid.eco $(SHAREDIR)
- install -m 755 -d $(SHAREDIR)/books
- install -m 666 ./books/*.* $(SHAREDIR)/books/
- install -m 755 -d $(SHAREDIR)/bases
- if test -d ./bases; then install -m 666 ./bases/*.* $(SHAREDIR)/bases/ ; fi
- install -m 755 -d $(SHAREDIR)/html
- cp -r ./html/* $(SHAREDIR)/html/
- install -m 755 -d $(SHAREDIR)/img/
- cp -r ./img/* $(SHAREDIR)/img/
+ install -m 755 -d "$(DESTDIR)$(SHAREDIR)"
+ install -m 755 -d "$(DESTDIR)$(BINDIR)"
+ install -m 755 scid $(SCRIPTS) $(EXECS) "$(DESTDIR)$(BINDIR)"
+ install -m 644 -p scid.eco "$(DESTDIR)$(SHAREDIR)"
+ install -m 755 -d "$(DESTDIR)$(SHAREDIR)/books"
+ install -m 666 ./books/*.* "$(DESTDIR)$(SHAREDIR)/books/"
+ install -m 755 -d "$(DESTDIR)$(SHAREDIR)/bases"
+ if test -d ./bases; then install -m 666 ./bases/*.* "$(DESTDIR)$(SHAREDIR)/bases/" ; fi
+ install -m 755 -d "$(DESTDIR)$(SHAREDIR)/html"
+ cp -r ./html/* "$(DESTDIR)$(SHAREDIR)/html/"
+ install -m 755 -d "$(DESTDIR)$(SHAREDIR)/img/"
+ cp -r ./img/* "$(DESTDIR)$(SHAREDIR)/img/"
install_engines: all_engines
- install -m 755 -d $(SHAREDIR)/engines
- install -m 755 -d $(SHAREDIR)/engines/phalanx-scid
- install ./engines/phalanx-scid/phalanx-scid $(SHAREDIR)/engines/phalanx-scid
- install -m 755 -d $(SHAREDIR)/engines/togaII1.2.1a
- install ./engines/togaII1.2.1a/src/togaII $(SHAREDIR)/engines/togaII1.2.1a/
+ install -m 755 -d "$(DESTDIR)$(SHAREDIR)/engines"
+ install -m 755 -d "$(DESTDIR)$(SHAREDIR)/engines/phalanx-scid"
+ install ./engines/phalanx-scid/phalanx-scid "$(DESTDIR)$(SHAREDIR)/engines/phalanx-scid"
+ install -m 755 -d "$(DESTDIR)$(SHAREDIR)/engines/togaII1.2.1a"
+ install ./engines/togaII1.2.1a/src/togaII "$(DESTDIR)$(SHAREDIR)/engines/togaII1.2.1a/"
install_mac: all
install -m 755 -d dist/Scid.app/Contents/MacOS
@@ -288,25 +288,25 @@
hdiutil create -fs "HFS+" -volname Scid -srcfolder dist "Scid $(SCID_VERSION) (`sw_vers -productName` `sw_vers -productVersion` `uname -p`).dmg"
uninstall:
- rm -rf $(SHAREDIR)/engines
- rm -rf $(SHAREDIR)/books
- rm -rf $(SHAREDIR)/bases
- rm -rf $(SHAREDIR)/data/
- rm -f $(SHAREDIR)/data/scid.eco
- rm -f $(BINDIR)/scid $(BINDIR)/sc_addmove $(BINDIR)/sc_epgn
- rm -f $(BINDIR)/sc_spell $(BINDIR)/sc_eco $(BINDIR)/sc_import
- rm -f $(BINDIR)/sc_remote $(BINDIR)/sc_tree $(BINDIR)/scidpgn
- rm -f $(BINDIR)/pgnfix $(BINDIR)/spliteco
- rm -f $(BINDIR)/pgnscid $(BINDIR)/tkscid
- rm -f $(BINDIR)/scmerge $(BINDIR)/scidlet
- rm -rf $(SHAREDIR)/html
+ rm -rf "$(DESTDIR)$(SHAREDIR)/engines"
+ rm -rf "$(DESTDIR)$(SHAREDIR)/books"
+ rm -rf "$(DESTDIR)$(SHAREDIR)/bases"
+ rm -rf "$(DESTDIR)$(SHAREDIR)/data/"
+ rm -f "$(DESTDIR)$(SHAREDIR)/data/scid.eco"
+ rm -f "$(DESTDIR)$(BINDIR)/scid $(BINDIR)/sc_addmove" "$(DESTDIR)$(BINDIR)/sc_epgn"
+ rm -f "$(DESTDIR)$(BINDIR)/sc_spell" "$(DESTDIR)$(BINDIR)/sc_eco" "$(DESTDIR)$(BINDIR)/sc_import"
+ rm -f "$(DESTDIR)$(BINDIR)/sc_remote" "$(DESTDIR)$(BINDIR)/sc_tree" "$(DESTDIR)$(BINDIR)/scidpgn"
+ rm -f "$(DESTDIR)$(BINDIR)/pgnfix" "$(DESTDIR)$(BINDIR)/spliteco"
+ rm -f "$(DESTDIR)$(BINDIR)/pgnscid" "$(DESTDIR)$(BINDIR)/tkscid"
+ rm -f "$(DESTDIR)$(BINDIR)/scmerge" "$(DESTDIR)$(BINDIR)/scidlet"
+ rm -rf "$(DESTDIR)$(SHAREDIR)/html"
### To remove Scid files placed in the BINDIR and SHAREDIR directories,
# type "make distclean".
#
distclean:
- cd $(BINDIR) && rm -f $(EXECS) $(SCRIPTS)
- -rm -f $(SHAREDIR)/scid.eco
+ cd $(DESTDIR)$(BINDIR) && rm -f "$(EXECS)" "$(SCRIPTS)"
+ -rm -f "$(DESTDIR)$(SHAREDIR)/scid.eco"
### To remove object and executable files: type "make clean".
#
--- tcl/start.tcl.old
+++ tcl/start.tcl
@@ -186,7 +186,7 @@
# scidShareDir, scidImgDir, scidBooksDir, scidBasesDir, ecoFile:
# Location of Scid resources
- set scidShareDir [file normalize [file join $scidExeDir "../share/scid"]]
+ set scidShareDir "@GENTOO_DATADIR@"
if {! [file isdirectory $::scidShareDir]} {
set scidShareDir $::scidExeDir
}
@@ -849,7 +849,7 @@
### Audio move announcement options:
-set ::utils::sound::soundFolder [file nativename [file join $::scidExeDir sounds]]
+set ::utils::sound::soundFolder "@GENTOO_DATADIR@/sounds"
set ::utils::sound::announceNew 0
set ::utils::sound::announceForward 0
set ::utils::sound::announceBack 0
@@ -858,7 +858,7 @@
if {$windowsOS} {
set spellCheckFile [file join $scidDataDir "spelling.ssp"]
} else {
- set spellCheckFile "/usr/local/share/scid/spelling.ssp"
+ set spellCheckFile "@GENTOO_DATADIR@/spelling.ssp"
}
# book configuration
|
GitWeb