[Monodevelop-patches-list] r1231 - trunk/MonoDevelop

[commit-watcher at mono-cvs.ximian.com]

Author: jluke
Date: 2004-03-22 16:25:25 -0500 (Mon, 22 Mar 2004)
New Revision: 1231

Modified:
   trunk/MonoDevelop/ChangeLog
   trunk/MonoDevelop/Makefile.am
   trunk/MonoDevelop/configure.in
Log:
workaround EXTRA_DIST having variables conditionally defined


Modified: trunk/MonoDevelop/ChangeLog
===================================================================
--- trunk/MonoDevelop/ChangeLog	2004-03-22 20:57:24 UTC (rev 1230)
+++ trunk/MonoDevelop/ChangeLog	2004-03-22 21:25:25 UTC (rev 1231)
@@ -1,6 +1,8 @@
 2004-03-22  John Luke  <jluke at cfl.rr.coc>
 
 	* configure.in: make ENABLE_XDGMIME work right
+	* AssemblyInfo.cs*: generate the MonoDevelop versions from configure
+	* Makefile.am: workaround EXTRA_DIST conditional varaibles
 
 2004-03-22 Iñigo Illán <kodeport AT terra.es>
 

Modified: trunk/MonoDevelop/Makefile.am
===================================================================
--- trunk/MonoDevelop/Makefile.am	2004-03-22 20:57:24 UTC (rev 1230)
+++ trunk/MonoDevelop/Makefile.am	2004-03-22 21:25:25 UTC (rev 1231)
@@ -52,8 +52,10 @@
 profile-pad: $(MONOPAD)
 	cd build/bin && mono -O=inline --profile MonoPad.exe
 
-EXTRA_DIST = $(bin_SCRIPTS) $(desktop_DATA) \
-	$(mimeinfo_DATA) $(pixmap_DATA) $(application_DATA) $(xdgmime_DATA)
+# we can't use the variables that are conditionally defined
+EXTRA_DIST = $(bin_SCRIPTS) $(desktop_DATA) $(pixmap_DATA) \
+	monodevelop.mime monodevelop.keys monodevelop.applications \
+	monodevelop.xml
 
 DISTCLEANFILES = monodevelop
 

Modified: trunk/MonoDevelop/configure.in
===================================================================
--- trunk/MonoDevelop/configure.in	2004-03-22 20:57:24 UTC (rev 1230)
+++ trunk/MonoDevelop/configure.in	2004-03-22 21:25:25 UTC (rev 1231)
@@ -155,6 +155,7 @@
 data/Makefile
 data/resources/Makefile
 data/resources/glade/Makefile
+src/AddIns/DebuggerAddIn/AssemblyInfo.cs
 src/AddIns/DisplayBindings/SourceEditor/AssemblyInfo.cs
 src/AddIns/Misc/StartPage/AssemblyInfo.cs
 src/Main/StartUp/AssemblyInfo.cs