add PKGDATADIR macro and fix makefile bug

data/Makefile.am

@@ -1,4 +1,3 @@
 dist_pkgdata_DATA = \
 	wsj.words.gz wsj.splits.gz wsj.lexicon.gz wsj.grammar.gz \
-	jdc.words.gz jdc.splits.gz jdc.lexicon.gz jdc.grammar.gz \
-	;
+	jdc.words.gz jdc.splits.gz jdc.lexicon.gz jdc.grammar.gz

src/lib/Makefile.am

@@ -1,6 +1,6 @@
 lib_LTLIBRARIES = libckylark.la
 
-AM_CXXFLAGS = -I$(srcdir)/../include $(BOOST_CPPFLAGS)
+AM_CXXFLAGS = -I$(srcdir)/../include $(BOOST_CPPFLAGS) -DPKGDATADIR='"$(pkgdatadir)"'
 
 libckylark_la_SOURCES = \
 	BerkeleySignatureEstimator.cc \

src/lib/StreamFactory.cc

@@ -36,6 +36,23 @@ shared_ptr<InputStream> StreamFactory::createInputStream(const string & path) {
     } catch (exception & ex) {
     }
 
+    // try loading basic text stream from shared directory
+    string path2 = string(PKGDATADIR) + "/" + path;
+    try {
+        InputStream * stream = new TextInputStream(path2);
+        Tracer::println(1, "input path: " + path2 + " (mode=text)");
+        return shared_ptr<InputStream>(stream);
+    } catch (...) {
+    }
+
+    // try loading gzip stream from shared directory
+    string path2_gz = path2 + ".gz";
+    try {
+        InputStream * stream = new GZipInputStream(path2_gz);
+        Tracer::println(1, "input path: " + path2_gz + " (mode=gzip)");
+        return shared_ptr<InputStream>(stream);
+    } catch (exception & ex) {
+    }
     // all cases are failed
     throw runtime_error("StreamFactory::createInputStream: cannot open file: " + path);
 }