merges with https://bitbucket.org/JaFojtik/canfestival-3
authorEdouard Tisserant
Sat, 04 Feb 2012 00:57:39 +0100
changeset 698 a0b50d6ce746
parent 693 e21822be8189 (diff)
parent 697 24a2aec61731 (current diff)
child 710 e7a45c77d6ec
merges with https://bitbucket.org/JaFojtik/canfestival-3
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
 
--- 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