Index: trunk/install.sh
===================================================================
--- trunk/install.sh	(revision 669)
+++ trunk/install.sh	(working copy)
@@ -1,4 +1,4 @@
-#/bin/bash
+#!/usr/local/bin/bash
 # This script will build and install GnuSpeech in ~/GNUstep.
 
 set -e
@@ -6,33 +6,33 @@
 base_dir=$PWD
 
 cd Frameworks/Tube
-make debug=no
-make install GNUSTEP_INSTALLATION_DOMAIN=USER
+gmake debug=no
+gmake install GNUSTEP_INSTALLATION_DOMAIN=USER
 cd "$base_dir"
 
 cd Frameworks/GnuSpeech
-make debug=no
-make install GNUSTEP_INSTALLATION_DOMAIN=USER
+gmake debug=no
+gmake install GNUSTEP_INSTALLATION_DOMAIN=USER
 cd "$base_dir"
 
 cd Applications/Monet
-make debug=no
-make install GNUSTEP_INSTALLATION_DOMAIN=USER
+gmake debug=no
+gmake install GNUSTEP_INSTALLATION_DOMAIN=USER
 cd "$base_dir"
 
 cd Applications/PreMo
-make debug=no
-make install GNUSTEP_INSTALLATION_DOMAIN=USER
+gmake debug=no
+gmake install GNUSTEP_INSTALLATION_DOMAIN=USER
 cd "$base_dir"
 
 cd Tools/GnuSpeechCLI
-make debug=no
-make install GNUSTEP_INSTALLATION_DOMAIN=USER
+gmake debug=no
+gmake install GNUSTEP_INSTALLATION_DOMAIN=USER
 cd "$base_dir"
 
 cd Applications/Synthesizer
-make debug=no
-make install GNUSTEP_INSTALLATION_DOMAIN=USER
+gmake debug=no
+gmake install GNUSTEP_INSTALLATION_DOMAIN=USER
 cd "$base_dir"
 
 echo === Ok.
Index: trunk/Frameworks/GnuSpeech/Tube/TRMSynthesizer.h
===================================================================
--- trunk/Frameworks/GnuSpeech/Tube/TRMSynthesizer.h	(revision 669)
+++ trunk/Frameworks/GnuSpeech/Tube/TRMSynthesizer.h	(working copy)
@@ -27,7 +27,7 @@
 #import <Tube/TubeModel.h>
 
 #ifdef GNUSTEP
-#import <portaudio.h>
+#import <portaudio2/portaudio.h>
 #else
 #import <AudioUnit/AudioUnit.h>
 #endif
Index: trunk/Frameworks/GnuSpeech/GNUmakefile.preamble
===================================================================
--- trunk/Frameworks/GnuSpeech/GNUmakefile.preamble	(revision 669)
+++ trunk/Frameworks/GnuSpeech/GNUmakefile.preamble	(working copy)
@@ -1,2 +1,7 @@
 
-LIBRARIES_DEPEND_UPON = -lportaudio -lgdbm -lgdbm_compat
+ADDITIONAL_INCLUDE_DIRS += -I/usr/local/include/portaudio2
+
+ADDITIONAL_LIB_DIRS += -L/usr/local/lib/portaudio2
+
+LIBRARIES_DEPEND_UPON = -lportaudio -ldb-4.2
+ #-lgdbm -lgdbm_compat
Index: trunk/Applications/PreMo/GNUmakefile.postamble
===================================================================
--- trunk/Applications/PreMo/GNUmakefile.postamble	(revision 669)
+++ trunk/Applications/PreMo/GNUmakefile.postamble	(working copy)
@@ -1,8 +1,8 @@
 
 before-all::
-	cp -u ../../Frameworks/GnuSpeech/TextProcessing/2.0eMainDictionary.dict .
-	cp -u ../../Frameworks/GnuSpeech/TextProcessing/SpecialAcronyms.plist .
-	cp -u ../../Frameworks/GnuSpeech/TextProcessing/TTSSuffixList.txt .
+	cp ../../Frameworks/GnuSpeech/TextProcessing/2.0eMainDictionary.dict .
+	cp ../../Frameworks/GnuSpeech/TextProcessing/SpecialAcronyms.plist .
+	cp ../../Frameworks/GnuSpeech/TextProcessing/TTSSuffixList.txt .
 
 after-clean::
 	rm -f 2.0eMainDictionary.dict
Index: trunk/Applications/Monet/GNUmakefile.postamble
===================================================================
--- trunk/Applications/Monet/GNUmakefile.postamble	(revision 669)
+++ trunk/Applications/Monet/GNUmakefile.postamble	(working copy)
@@ -18,9 +18,9 @@
 #	$(LN_S) -f ../../Tools/softwareTRM/wavetable.c
 #	$(LN_S) -f ../../Tools/softwareTRM/TRMSynthesizer.m
 #	$(LN_S) -f ./Compatibility/MMOldFormulaNode.m
-	cp -u ../../Frameworks/GnuSpeech/TextProcessing/2.0eMainDictionary.dict .
-	cp -u ../../Frameworks/GnuSpeech/TextProcessing/SpecialAcronyms.plist .
-	cp -u ../../Frameworks/GnuSpeech/TextProcessing/TTSSuffixList.txt .
+	cp ../../Frameworks/GnuSpeech/TextProcessing/2.0eMainDictionary.dict .
+	cp ../../Frameworks/GnuSpeech/TextProcessing/SpecialAcronyms.plist .
+	cp ../../Frameworks/GnuSpeech/TextProcessing/TTSSuffixList.txt .
 
 after-clean::
 #	rm -rf fir.h
Index: trunk/Tools/GnuSpeechCLI/GNUmakefile.postamble
===================================================================
--- trunk/Tools/GnuSpeechCLI/GNUmakefile.postamble	(revision 669)
+++ trunk/Tools/GnuSpeechCLI/GNUmakefile.postamble	(working copy)
@@ -1,8 +1,8 @@
 
 before-all::
-	cp -u ../../Frameworks/GnuSpeech/TextProcessing/2.0eMainDictionary.dict .
-	cp -u ../../Frameworks/GnuSpeech/TextProcessing/SpecialAcronyms.plist .
-	cp -u ../../Frameworks/GnuSpeech/TextProcessing/TTSSuffixList.txt .
+	cp ../../Frameworks/GnuSpeech/TextProcessing/2.0eMainDictionary.dict .
+	cp ../../Frameworks/GnuSpeech/TextProcessing/SpecialAcronyms.plist .
+	cp ../../Frameworks/GnuSpeech/TextProcessing/TTSSuffixList.txt .
 
 after-clean::
 	rm -f 2.0eMainDictionary.dict