Attachment #307467 for bug #410527




++ scid_vs_pc-4.6/tcl/config.tcl

} elseif {$macApp} {
  set scidShareDir [file normalize [file join $scidExeDir "../Resources"]]
} else {
  set scidShareDir "@GENTOO_DATADIR@"
}

# also reset BooksDir if the variable is set, but doesn't exist S.A.
++ scid_vs_pc-4.6/Makefile.conf

# Small extra programs. Most are written in Tcl using tcscid, 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 eco2pgn

####################


install: install_scid install_engines

install_scid: all_scid
	install -m 755 -d $(DESTDIR)$(SHAREDIR)
	install -m 755 -d $(DESTDIR)$(BINDIR)
	install -m 755 -d $(DESTDIR)$(SHAREDIR)/data/
	install -m 755 scid $(SCRIPTS) $(EXECS) $(DESTDIR)$(BINDIR)
	install -m 644 -p scid.eco $(DESTDIR)$(SHAREDIR)/data/
	install -m 644 -p spelling.ssp $(DESTDIR)$(SHAREDIR)
	install -m 755 -d $(DESTDIR)$(SHAREDIR)/books
	install -m 666 ./books/* $(DESTDIR)$(SHAREDIR)/books/
	install -m 755 -d $(DESTDIR)$(SHAREDIR)/bases
	install -m 666 ./bases/* $(DESTDIR)$(SHAREDIR)/bases/
	install -m 755 -d $(DESTDIR)$(SHAREDIR)/html
	cp -r ./html/* $(DESTDIR)$(SHAREDIR)/html/
	chmod -R 0777 $(DESTDIR)$(SHAREDIR)/html/*
	@if [ "`id -u`" -eq 0 ]; then \
		install -m 755 -d $(DESTDIR)$(FONTDIR); \
		install -m 644 -p fonts/*.ttf $(DESTDIR)$(FONTDIR); \
	else \
		install -m 755 -d ~/.fonts; \
		install -m 644 -p fonts/*.ttf ~/.fonts; \
	fi
	@if [ ! -z "`which fc-cache`" ]; then \
		if [ "`id -u`" -eq 0 ]; then \
 			fc-cache -fv $(FONTDIR); \
		else \
			fc-cache -fv ~/.fonts; \
		fi; \
	else \
		echo "Don't know how to setup truetype fonts (fc-cache not available)."; \
		echo "Please contact your system administrator."; \
	fi

install_engines: engines
	install -m 755 -d $(DESTDIR)$(SHAREDIR)/engines
	install -m 755 -d $(DESTDIR)$(SHAREDIR)/engines/phalanx
	install -m 666 ./engines/phalanx/eco.phalanx $(DESTDIR)$(SHAREDIR)/engines/phalanx
	install -m 644 ./engines/phalanx/HISTORY $(DESTDIR)$(SHAREDIR)/engines/phalanx
	install -m 644 ./engines/phalanx/pbook.phalanx $(DESTDIR)$(SHAREDIR)/engines/phalanx
	install -m 644 ./engines/phalanx/README $(DESTDIR)$(SHAREDIR)/engines/phalanx
	install ./engines/phalanx/phalanx $(DESTDIR)$(BINDIR)
	install -m 755 -d $(DESTDIR)$(SHAREDIR)/engines/toga
	install -m 644 ./engines/toga/copying.txt $(DESTDIR)$(SHAREDIR)/engines/toga
	install -m 644 ./engines/toga/readme.txt $(DESTDIR)$(SHAREDIR)/engines/toga
	install ./engines/toga/src/fruit $(DESTDIR)$(BINDIR)

uninstall:
	rm -rf $(SHAREDIR)/engines
++ scid_vs_pc-4.6/tcl/utils/sound.tcl

  variable soundFolder

  ::splash::add "Setting up audio move announcement..."
  if {[catch {package require snack}]} {
    set hasSnackPackage 0
    ::splash::add "   Move speech disabled - Snack sound package not found"
    return

Return to bug 410527

Line Link Here

(-)file_not_specified_in_diff (-42 / +32 lines)
0	-- scid_vs_pc-4.6.orig/tcl/config.tcl	0	++ scid_vs_pc-4.6/tcl/config.tcl
Lines 8-14 Link Here
8	} elseif {$macApp} {	8	} elseif {$macApp} {
9	set scidShareDir [file normalize [file join $scidExeDir "../Resources"]]	9	set scidShareDir [file normalize [file join $scidExeDir "../Resources"]]
10	} else {	10	} else {
11	set scidShareDir [file normalize [file join $scidExeDir "../share/scid"]]	11	set scidShareDir "@GENTOO_DATADIR@"
12	}	12	}
13		13
14	# also reset BooksDir if the variable is set, but doesn't exist S.A.	14	# also reset BooksDir if the variable is set, but doesn't exist S.A.
15	-- scid_vs_pc-4.6.orig/Makefile.conf	15	++ scid_vs_pc-4.6/Makefile.conf
Lines 179-185 Link Here
179	# Small extra programs. Most are written in Tcl using tcscid, but	179	# Small extra programs. Most are written in Tcl using tcscid, but
180	# a few contributed ones may be in Python or other languages.	180	# a few contributed ones may be in Python or other languages.
181		181
182	SCRIPTS= sc_addmove sc_epgn sc_spell sc_eco sc_import sc_remote sc_tree scidpgn pgnfix spliteco	182	SCRIPTS= sc_addmove sc_epgn sc_spell sc_eco sc_import sc_remote sc_tree scidpgn pgnfix spliteco eco2pgn
183		183
184	####################	184	####################
185		185
Lines 203-251 Link Here
203	install: install_scid install_engines	203	install: install_scid install_engines
204		204
205	install_scid: all_scid	205	install_scid: all_scid
206	install -m 755 -d $(SHAREDIR)	206	install -m 755 -d $(DESTDIR)$(SHAREDIR)
207	install -m 755 -d $(BINDIR)	207	install -m 755 -d $(DESTDIR)$(BINDIR)
208	install -m 755 -d $(SHAREDIR)/data/	208	install -m 755 -d $(DESTDIR)$(SHAREDIR)/data/
209	install -m 755 scid $(SCRIPTS) $(EXECS) $(BINDIR)	209	install -m 755 scid $(SCRIPTS) $(EXECS) $(DESTDIR)$(BINDIR)
210	install -m 644 -p scid.eco $(SHAREDIR)/data/	210	install -m 644 -p scid.eco $(DESTDIR)$(SHAREDIR)/data/
211	install -m 644 -p spelling.ssp $(SHAREDIR)	211	install -m 644 -p spelling.ssp $(DESTDIR)$(SHAREDIR)
212	install -m 755 -d $(SHAREDIR)/books	212	install -m 755 -d $(DESTDIR)$(SHAREDIR)/books
213	install -m 666 ./books/* $(SHAREDIR)/books/	213	install -m 666 ./books/* $(DESTDIR)$(SHAREDIR)/books/
214	install -m 755 -d $(SHAREDIR)/bases	214	install -m 755 -d $(DESTDIR)$(SHAREDIR)/bases
215	install -m 666 ./bases/* $(SHAREDIR)/bases/	215	install -m 666 ./bases/* $(DESTDIR)$(SHAREDIR)/bases/
216	install -m 755 -d $(SHAREDIR)/html	216	install -m 755 -d $(DESTDIR)$(SHAREDIR)/html
217	cp -r ./html/* $(SHAREDIR)/html/	217	cp -r ./html/* $(DESTDIR)$(SHAREDIR)/html/
218	chmod -R 0777 $(SHAREDIR)/html/*	218	chmod -R 0777 $(DESTDIR)$(SHAREDIR)/html/*
219	@if [ "`id -u`" -eq 0 ]; then \	219	@if [ "`id -u`" -eq 0 ]; then \
220	install -m 755 -d $(FONTDIR); \	220	install -m 755 -d $(DESTDIR)$(FONTDIR); \
221	install -m 644 -p fonts/*.ttf $(FONTDIR); \	221	install -m 644 -p fonts/*.ttf $(DESTDIR)$(FONTDIR); \
222	else \	222	else \
223	install -m 755 -d ~/.fonts; \	223	install -m 755 -d ~/.fonts; \
224	install -m 644 -p fonts/*.ttf ~/.fonts; \	224	install -m 644 -p fonts/*.ttf ~/.fonts; \
225	fi	225	fi
226	@if [ ! -z "`which fc-cache`" ]; then \
227	if [ "`id -u`" -eq 0 ]; then \
228	fc-cache -fv $(FONTDIR); \
229	else \
230	fc-cache -fv ~/.fonts; \
231	fi; \
232	else \
233	echo "Don't know how to setup truetype fonts (fc-cache not available)."; \
234	echo "Please contact your system administrator."; \
235	fi
236		226
237	install_engines: engines	227	install_engines: engines
238	install -m 755 -d $(SHAREDIR)/engines	228	install -m 755 -d $(DESTDIR)$(SHAREDIR)/engines
239	install -m 755 -d $(SHAREDIR)/engines/phalanx	229	install -m 755 -d $(DESTDIR)$(SHAREDIR)/engines/phalanx
240	install -m 666 ./engines/phalanx/eco.phalanx $(SHAREDIR)/engines/phalanx	230	install -m 666 ./engines/phalanx/eco.phalanx $(DESTDIR)$(SHAREDIR)/engines/phalanx
241	install -m 644 ./engines/phalanx/HISTORY $(SHAREDIR)/engines/phalanx	231	install -m 644 ./engines/phalanx/HISTORY $(DESTDIR)$(SHAREDIR)/engines/phalanx
242	install -m 644 ./engines/phalanx/pbook.phalanx $(SHAREDIR)/engines/phalanx	232	install -m 644 ./engines/phalanx/pbook.phalanx $(DESTDIR)$(SHAREDIR)/engines/phalanx
243	install -m 644 ./engines/phalanx/README $(SHAREDIR)/engines/phalanx	233	install -m 644 ./engines/phalanx/README $(DESTDIR)$(SHAREDIR)/engines/phalanx
244	install ./engines/phalanx/phalanx $(BINDIR)	234	install ./engines/phalanx/phalanx $(DESTDIR)$(BINDIR)
245	install -m 755 -d $(SHAREDIR)/engines/toga	235	install -m 755 -d $(DESTDIR)$(SHAREDIR)/engines/toga
246	install -m 644 ./engines/toga/copying.txt $(SHAREDIR)/engines/toga	236	install -m 644 ./engines/toga/copying.txt $(DESTDIR)$(SHAREDIR)/engines/toga
247	install -m 644 ./engines/toga/readme.txt $(SHAREDIR)/engines/toga	237	install -m 644 ./engines/toga/readme.txt $(DESTDIR)$(SHAREDIR)/engines/toga
248	install ./engines/toga/src/fruit $(BINDIR)	238	install ./engines/toga/src/fruit $(DESTDIR)$(BINDIR)
249		239
250	uninstall:	240	uninstall:
251	rm -rf $(SHAREDIR)/engines	241	rm -rf $(SHAREDIR)/engines
252	-- scid_vs_pc-4.6.orig/tcl/utils/sound.tcl	242	++ scid_vs_pc-4.6/tcl/utils/sound.tcl
Lines 41-47 Link Here
41	variable soundFolder	41	variable soundFolder
42		42
43	::splash::add "Setting up audio move announcement..."	43	::splash::add "Setting up audio move announcement..."
44	if {[catch {package require snack 2.0}]} {	44	if {[catch {package require snack}]} {
45	set hasSnackPackage 0	45	set hasSnackPackage 0
46	::splash::add " Move speech disabled - Snack sound package not found"	46	::splash::add " Move speech disabled - Snack sound package not found"
47	return	47	return