More default setup for FG_ROOT

Modified Files:
	fgviewer/Makefile.am fgviewer/fgviewer.cxx

diff --git a/utils/fgviewer/Makefile.am b/utils/fgviewer/Makefile.am
index c0384d803ba11b1086ff36880c148e02d37a705a..9d9b18534672a944fcdfed0441b71d798aa14f6c 100644 (file)
--- a/utils/fgviewer/Makefile.am
+++ b/utils/fgviewer/Makefile.am
@@ -1,3 +1,6 @@
+
+AM_CXXFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\"
+
 bin_PROGRAMS = fgviewer
 
 fgviewer_SOURCES = fgviewer.cxx

diff --git a/utils/fgviewer/fgviewer.cxx b/utils/fgviewer/fgviewer.cxx
index 6851dbd5f5184716f1ea3de4a04dafeb04bba8a8..42f2104ca4c5678c8a5bf8ac72848fb90a2784e0 100644 (file)
--- a/utils/fgviewer/fgviewer.cxx
+++ b/utils/fgviewer/fgviewer.cxx
@@ -81,7 +81,11 @@ main(int argc, char** argv)
     if (fg_root_env)
         fg_root = fg_root_env;
     else
+#if defined(PKGDATADIR)
+        fg_root = PKGDATADIR;
+#else
         fg_root = ".";
+#endif
 
     osgDB::FilePathList filePathList;
     filePathList.push_back(fg_root);