[mapguide-commits] r1085 - in trunk/MgDev: . Common/MapGuideCommon Server/src Web/src

[svn_mapguide at osgeo.org]

Author: timstrang
Date: 2007-02-01 12:41:48 -0500 (Thu, 01 Feb 2007)
New Revision: 1085

Modified:
   trunk/MgDev/Common/MapGuideCommon/Makefile.am
   trunk/MgDev/Server/src/Makefile.am
   trunk/MgDev/Web/src/Makefile.am
   trunk/MgDev/configure.in
Log:
Fix some Makefile.am for the change made yesterday to use a common resource file

Modified: trunk/MgDev/Common/MapGuideCommon/Makefile.am
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/Makefile.am	2007-01-31 21:45:27 UTC (rev 1084)
+++ trunk/MgDev/Common/MapGuideCommon/Makefile.am	2007-02-01 17:41:48 UTC (rev 1085)
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign
 
-EXTRA_DIST = MapGuideCommon.vcproj
+EXTRA_DIST = Resources MapGuideCommon.vcproj
 
 lib_LTLIBRARIES = libMgMapGuideCommon.la
 

Modified: trunk/MgDev/Server/src/Makefile.am
===================================================================
--- trunk/MgDev/Server/src/Makefile.am	2007-01-31 21:45:27 UTC (rev 1084)
+++ trunk/MgDev/Server/src/Makefile.am	2007-02-01 17:41:48 UTC (rev 1085)
@@ -1,4 +1,4 @@
 AUTOMAKE_OPTIONS = foreign
 SUBDIRS = Common Gws Services $(map_unittesting_dir) Core
 DIST_SUBDIRS = Common Gws Services $(map_unittesting_dir) Core
-EXTRA_DIST = Resources PostBuild Wms Wfs
+EXTRA_DIST = PostBuild Wms Wfs

Modified: trunk/MgDev/Web/src/Makefile.am
===================================================================
--- trunk/MgDev/Web/src/Makefile.am	2007-01-31 21:45:27 UTC (rev 1084)
+++ trunk/MgDev/Web/src/Makefile.am	2007-02-01 17:41:48 UTC (rev 1085)
@@ -29,7 +29,7 @@
 	test -d $(webinfdir) || $(mkinstalldirs) $(webinfdir)
 	@cp -rfp mapadmin/* $(mapadmindir)
 	@cp -fp PhpApi/constants.php $(mapadmindir)
-	@cp -fp mapagent/Resources/*.res $(resourcesdir)
+	@cp -fp ../../Common/MapGuideCommon/Resources/mapguide_en.res $(resourcesdir)
 	@cp -rfp mapviewerphp/* $(mapviewerphpdir)
 	@cp -fp PhpApi/constants.php $(mapviewerphpdir)
 	@find mapviewerjava -maxdepth 1 -type f -exec cp -fp {} $(mapviewerjavadir) \;

Modified: trunk/MgDev/configure.in
===================================================================
--- trunk/MgDev/configure.in	2007-01-31 21:45:27 UTC (rev 1084)
+++ trunk/MgDev/configure.in	2007-02-01 17:41:48 UTC (rev 1085)
@@ -4,7 +4,7 @@
 # Variables
 # Following are the makefile directories 
 #----------------------------------------------------------------------
-AC_INIT(mapguide,1.0.1,http://mapguide.osgeo.org)
+AC_INIT(mapguide,1.2.0,http://mapguide.osgeo.org)
 AC_CONFIG_SRCDIR(configure.in)
 AM_INIT_AUTOMAKE