From: WANG <wang@wang-OptiPlex-780.(none)>
Date: Thu, 5 Sep 2013 13:58:13 +0000 (+0200)
Subject: Merge branch 'master' of https://scm.cri.ensmp.fr/git/Faustine
X-Git-Url: https://scm.cri.mines-paristech.fr/git/Faustine.git/commitdiff_plain/22281bef330c4b8dda5217f5b7d0f77257c568ae?hp=e4c4706aa217ba2c8fca216860764ad5ef7d740a

Merge branch 'master' of https://scm.cri.ensmp.fr/git/Faustine
---

diff --git a/interpretor/preprocessor/faust-0.9.47mr3/compiler/parser/enrobage.cpp b/interpretor/preprocessor/faust-0.9.47mr3/compiler/parser/enrobage.cpp
index e001b72..2d1599b 100644
--- a/interpretor/preprocessor/faust-0.9.47mr3/compiler/parser/enrobage.cpp
+++ b/interpretor/preprocessor/faust-0.9.47mr3/compiler/parser/enrobage.cpp
@@ -184,6 +184,33 @@ ifstream* open_arch_stream(const char* filename)
 		f->open(filename, ifstream::in);
 		if (f->good()) return f; else delete f;
 	}
+
+	/* Faustine directories (Karim Barkati 09/2013) */
+
+#ifdef INSTALL_PREFIX
+	err = chdir(old);
+	if (chdir(INSTALL_PREFIX "/lib/faustine")==0) {
+        ifstream* f = new ifstream();
+		f->open(filename); 
+		if (f->good()) return f; else delete f;
+	}
+#endif
+	err = chdir(old);
+	if (chdir("/usr/local/lib/faustine")==0) {
+        ifstream* f = new ifstream();
+		f->open(filename); 
+		if (f->good()) return f; else delete f;
+	}
+	err = chdir(old);
+	if (chdir("/usr/lib/faustine")==0) {
+        ifstream* f = new ifstream();
+		f->open(filename); 
+		if (f->good()) return f; else delete f;
+	}
+	
+	/* End of Faustine directories */
+
+
 #ifdef INSTALL_PREFIX
 	err = chdir(old);
 	if (chdir(INSTALL_PREFIX "/lib/faust")==0) {