autotools: Don't shadow copy the phsource directory into espeak-data.

Makefile.am

@@ -138,12 +138,7 @@ src/espeakedit: $(common_SOURCE) $(libespeak_SOURCE) $(espeakedit_SOURCE)
 espeak-phoneme-data:
 	cd platforms/$(PLATFORM) && make PREFIX=$(PREFIX) && cd ../..
 
-espeak-data/phsource/dir.stamp: phsource/ph_* phsource/phonemes phsource/intonation
-	rm -rf espeak-data/phsource
-	./shadowdir $(PWD)/phsource $(PWD)/espeak-data/phsource
-	touch espeak-data/phsource/dir.stamp
-
-espeak-data/phontab: src/espeakedit espeak-data/phsource/dir.stamp
+espeak-data/phontab: src/espeakedit
 	ESPEAK_DATA_PATH=$(PWD) src/espeakedit --compile
 
 ##### dictionaries:

shadowdir

@@ -1,22 +0,0 @@
-#!/usr/bin/python
-#
-# Copyright (C) 2011 Reece H. Dunn
-# Licence: GPLv3
-#
-# A script for shadowing a directory tree to another (equivalent to lndir).
-
-import sys
-import os
-
-def shadow(src, dst):
-	if not os.path.exists(dst):
-		os.makedirs(dst)
-	for fn in os.listdir(src):
-		srcpath = os.path.join(src, fn)
-		dstpath = os.path.join(dst, fn)
-		if os.path.isdir(srcpath):
-			shadow(srcpath, dstpath)
-		else:
-			os.symlink(srcpath, dstpath)
-
-shadow(sys.argv[1], sys.argv[2])

src/options.cpp

@@ -167,12 +167,12 @@ void ConfigInit(bool use_defaults)
 	basedir = wxString(path_base,wxConvLocal);  // this is only used to set defaults for other paths if they are not in the config file
 	if (use_defaults)
 	{
-		path_spectload = basedir + _T("/phsource");
-		path_spectload2 = basedir + _T("/phsource");
+		path_spectload = basedir + _T("/../phsource");
+		path_spectload2 = basedir + _T("/../phsource");
 		path_pitches = basedir + _T("/pitch");
-		path_phsource = basedir + _T("/phsource");
+		path_phsource = basedir + _T("/../phsource");
 		path_phfile = path_phsource + _T("/phonemes");
-		path_dictsource = basedir + _T("/dictsource");
+		path_dictsource = basedir + _T("/../dictsource");
 		path_modifiervoice = basedir;
 		path_dir1 = basedir;
 	}