* configure.in: Detect iconv at configuration time.

* src/po/Makefile.am: Invoke detected iconv in its simplest form.
Minor cleanup.
* gramps.sh.in: Correct paths for systems with custom datadir.
* src/DisplayTrace.py: Check for LANG before including in the message.


svn: r2279

src/DisplayTrace.py

@@ -18,6 +18,8 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
+# $Id$
+
 #-------------------------------------------------------------------------
 #
 # Standard python modules
@@ -74,7 +76,8 @@ class DisplayTrace:
                     'email message to gramps-bugs@lists.sourceforge.net\n\n'))
 
         msg.write("GRAMPS : %s\n" % const.version)
-        msg.write("LANG : %s\n" % os.environ['LANG'])
+        if os.environ.has_key('LANG'):
+            msg.write("LANG : %s\n" % os.environ['LANG'])
         msg.write("Python : %s.%s.%s %s\n" % (ver[0],ver[1],ver[2],ver[3]))
         msg.write("GTK : %s.%s.%s\n" % gtk.gtk_version)
         msg.write('PyGTK : %d.%d.%d\n' % gtk.pygtk_version)

src/po/Makefile.am

@@ -20,12 +20,12 @@ uninstall-local:
 SUFFIXES = .po .mo
 
 .po.mo:
-	@MSGCONV@ --to-code=UTF-8 $< -o temp.po
+	$(MSGCONV) --to-code=UTF-8 $< -o temp.po
 	$(MSGFMT) -v temp.po -o $@
 	rm temp.po
 
 zh_CN.mo: $(top_srcdir)/src/po/zh_CN.po
-	iconv --from-code=GB2312 --to-code=UTF-8 $< -o temp.po
+	$(ICONV) -f GB2312 -t UTF-8 $< > temp.po
 	$(MSGFMT) -v temp.po -o $@
 	rm temp.po