# HG changeset patch
# User Edouard Tisserant
# Date 1328313459 -3600
# Node ID a0b50d6ce7460b5a4318ad9373e11b43b3af90d3
# Parent  e21822be81891ea25ef33b40d8d8032a3a1fbac7# Parent  24a2aec617312b9f4ee76e755410c4e3f7d616bf
merges with https://bitbucket.org/JaFojtik/canfestival-3

diff -r 24a2aec61731 -r a0b50d6ce746 configure
--- a/configure	Fri Feb 03 22:34:44 2012 +0100
+++ b/configure	Sat Feb 04 00:57:39 2012 +0100
@@ -590,7 +590,7 @@
 
 if [ "$SUB_TARGET" = "unix" ]; then
 	if [ "$LD" = "" ]; then
-		LD=$CC
+		LD=$CXX
 	fi
 fi
 
diff -r 24a2aec61731 -r a0b50d6ce746 objdictgen/Makefile.in
--- a/objdictgen/Makefile.in	Fri Feb 03 22:34:44 2012 +0100
+++ b/objdictgen/Makefile.in	Sat Feb 04 00:57:39 2012 +0100
@@ -36,7 +36,7 @@
 
 install: gnosis
 	mkdir -p $(PREFIX)/objdictgen
-	cp -r *.py* config doc doc_index locale examples gnosis $(PREFIX)/objdictgen
+	cp -r *.py* config doc doc_index locale examples gnosis *.ico $(PREFIX)/objdictgen
 	chmod -R a+r $(PREFIX)/objdictgen
 	mkdir -p $(PREFIX)/bin
 	ln -sf $(PREFIX)/objdictgen/objdictedit.py $(PREFIX)/bin/objdictedit