[mapguide-commits] r7252 - in trunk/MgDev: Server/src/Core Web/src

[svn_mapguide at osgeo.org]

Author: jng
Date: 2012-12-08 07:15:44 -0800 (Sat, 08 Dec 2012)
New Revision: 7252

Modified:
   trunk/MgDev/Server/src/Core/Makefile.am
   trunk/MgDev/Web/src/Makefile.am
Log:
Re-integrate r7251 to trunk

Modified: trunk/MgDev/Server/src/Core/Makefile.am
===================================================================
--- trunk/MgDev/Server/src/Core/Makefile.am	2012-12-08 14:59:43 UTC (rev 7251)
+++ trunk/MgDev/Server/src/Core/Makefile.am	2012-12-08 15:15:44 UTC (rev 7252)
@@ -296,6 +296,7 @@
 serverconfig_linux.ini :
 	@sed -e 's#^FdoPath.*=.*#FdoPath                            = $(map_fdo_lib)#' \
              -e 's#^LogsPath.*=.*#LogsPath                           = Logs/#' \
+             -e 's#^MentorDictionaryPath.*=.*#MentorDictionaryPath   = ${mentor_dict_install_dir}#' \
              -e 's#^ResourcesPath.*=.*#ResourcesPath                      = Resources/#' \
              -e 's#^TempPath.*=.*#TempPath                           = Temp/#' \
              -e 's#^WmsDocumentPath.*=.*#WmsDocumentPath                    = Wms/#' \

Modified: trunk/MgDev/Web/src/Makefile.am
===================================================================
--- trunk/MgDev/Web/src/Makefile.am	2012-12-08 14:59:43 UTC (rev 7251)
+++ trunk/MgDev/Web/src/Makefile.am	2012-12-08 15:15:44 UTC (rev 7252)
@@ -5,6 +5,8 @@
 
 prefix=@prefix@/webserverextensions/www
 
+mentor_dict_install_dir=@prefix@/share/gis/coordsys
+
 apachedir = @prefix@/webserverextensions/apache2
 apachemodulesdir = ${apachedir}/modules
 apacheconfdir = ${apachedir}/conf
@@ -58,6 +60,7 @@
 
 install-data-hook:
 	@sed -e 's#^ResourcesPath.*=.*#ResourcesPath                      = ${prefix}/Resources/#' \
+          -e 's#^MentorDictionaryPath.*=.*#MentorDictionaryPath   = ${mentor_dict_install_dir}#' \
           -e 's#^TempPath.*=.*#TempPath                           = ${prefix}/TempDir/#' \
           -e 's#^TemplateRootFolder.*=.*#TemplateRootFolder                 = ${fusiondir}/templates/mapguide#' \
           -e 's#^WidgetInfoFolder.*=.*#WidgetInfoFolder                   = ${fusiondir}/widgets/widgetinfo#' \