Author: benm
Date: 2005-05-08 19:27:19 -0400 (Sun, 08 May 2005)
New Revision: 44228
Modified:
trunk/mono-tools/ChangeLog
trunk/mono-tools/asn1view/ChangeLog
trunk/mono-tools/asn1view/gtk/Makefile.am
trunk/mono-tools/asn1view/gtk/script.in
trunk/mono-tools/configure.in
trunk/mono-tools/docbrowser/ChangeLog
trunk/mono-tools/docbrowser/Makefile.am
trunk/mono-tools/gnunit/ChangeLog
trunk/mono-tools/gnunit/src/Makefile.am
trunk/mono-tools/gnunit/src/script.in
trunk/mono-tools/gnunit/src/script2.in
Log:
In .:
2005-05-08 Ben Maurer <[EMAIL PROTECTED]>
* configure.in:
- Check for mono and put it in RUNTIME
- Don't check for monoresgen, as we don't ship that any more
the correct name is `resgen'
In asn1view:
2005-05-08 Ben Maurer <[EMAIL PROTECTED]>
* gtk/Makefile.am, gtk/script.in: use @RUNTIME@ rather than
@bin_dir@/mono. This is a problem for people who have mono-tools
and mono in a different prefix (say you install mono from rpm but
want to hack on monodoc).
In gnunit:
2005-05-08 Ben Maurer <[EMAIL PROTECTED]>
* src/Makefile.am, script*.in: use @RUNTIME@ rather than
@bin_dir@/mono. This is a problem for people who have mono-tools
and mono in a different prefix (say you install mono from rpm but
want to hack on monodoc).
In docbrowser:
2005-05-08 Ben Maurer <[EMAIL PROTECTED]>
* Makefile.am: use $(RUNTIME) rather than `mono'
Modified: trunk/mono-tools/ChangeLog
===================================================================
--- trunk/mono-tools/ChangeLog 2005-05-08 23:20:09 UTC (rev 44227)
+++ trunk/mono-tools/ChangeLog 2005-05-08 23:27:19 UTC (rev 44228)
@@ -1,3 +1,10 @@
+2005-05-08 Ben Maurer <[EMAIL PROTECTED]>
+
+ * configure.in:
+ - Check for mono and put it in RUNTIME
+ - Don't check for monoresgen, as we don't ship that any more
+ the correct name is `resgen'
+
2005-05-08 Sebastien Pouliot <[EMAIL PROTECTED]>
* configure.in: Added lines to generate asn1view Makefiles;
Modified: trunk/mono-tools/asn1view/ChangeLog
===================================================================
--- trunk/mono-tools/asn1view/ChangeLog 2005-05-08 23:20:09 UTC (rev 44227)
+++ trunk/mono-tools/asn1view/ChangeLog 2005-05-08 23:27:19 UTC (rev 44228)
@@ -1,3 +1,10 @@
+2005-05-08 Ben Maurer <[EMAIL PROTECTED]>
+
+ * gtk/Makefile.am, gtk/script.in: use @RUNTIME@ rather than
+ @bin_dir@/mono. This is a problem for people who have mono-tools
+ and mono in a different prefix (say you install mono from rpm but
+ want to hack on monodoc).
+
2005-05-08 Sebastien Pouliot <[EMAIL PROTECTED]>
* Initial import into SVN.
Modified: trunk/mono-tools/asn1view/gtk/Makefile.am
===================================================================
--- trunk/mono-tools/asn1view/gtk/Makefile.am 2005-05-08 23:20:09 UTC (rev
44227)
+++ trunk/mono-tools/asn1view/gtk/Makefile.am 2005-05-08 23:27:19 UTC (rev
44228)
@@ -46,7 +46,7 @@
-e 's,@''bindir@,$(bindir),g' \
-e 's,@''mono_one_instdir@,$(gasnviewdir),g' \
-e 's,@''exe_file@,[EMAIL PROTECTED],g' \
- -e 's,@''mono_interp@,mono --debug,g'
+ -e 's,@''RUNTIME@,@RUNTIME@,g'
gasnview :
$(REWRITE) $(srcdir)/script.in > [EMAIL PROTECTED]
Modified: trunk/mono-tools/asn1view/gtk/script.in
===================================================================
--- trunk/mono-tools/asn1view/gtk/script.in 2005-05-08 23:20:09 UTC (rev
44227)
+++ trunk/mono-tools/asn1view/gtk/script.in 2005-05-08 23:27:19 UTC (rev
44228)
@@ -1,2 +1,2 @@
#!/bin/sh
-exec @bindir@/@mono_interp@ @mono_one_instdir@/@exe_file@ "$@"
+exec @RUNTIME@ @mono_one_instdir@/@exe_file@ "$@"
Modified: trunk/mono-tools/configure.in
===================================================================
--- trunk/mono-tools/configure.in 2005-05-08 23:20:09 UTC (rev 44227)
+++ trunk/mono-tools/configure.in 2005-05-08 23:27:19 UTC (rev 44228)
@@ -7,6 +7,7 @@
dnl C# compiler
AC_PATH_PROG(MCS, mcs, no)
+AC_PATH_PROG(RUNTIME, mono, no)
CS="C#"
if test "x$MCS" = "xno" ; then
@@ -14,14 +15,19 @@
AC_MSG_ERROR([No $CS compiler found])
fi
-dnl monoresgen
-AC_PATH_PROG(MONORESGEN, monoresgen, no)
-if test "x$MONORESGEN" = "xno" ; then
- AC_MSG_ERROR([monoresgen not found in $PATH])
+if test "x$RUNTIME" = xno" ; then
+ AC_MSG_ERROR([No runtime found])
fi
+dnl resgen
+AC_PATH_PROG(RESGEN, resgen, no)
+if test "x$RESGEN" = "xno" ; then
+ AC_MSG_ERROR([resgen not found in $PATH])
+fi
+
AC_SUBST(MCS)
-AC_SUBST(MONORESGEN)
+AC_SUBST(RUNTIME)
+AC_SUBST(RESGEN)
PKG_CHECK_MODULES(NUNIT, mono-nunit)
AC_SUBST(NUNIT_LIBS)
Modified: trunk/mono-tools/docbrowser/ChangeLog
===================================================================
--- trunk/mono-tools/docbrowser/ChangeLog 2005-05-08 23:20:09 UTC (rev
44227)
+++ trunk/mono-tools/docbrowser/ChangeLog 2005-05-08 23:27:19 UTC (rev
44228)
@@ -1,3 +1,7 @@
+2005-05-08 Ben Maurer <[EMAIL PROTECTED]>
+
+ * Makefile.am: use $(RUNTIME) rather than `mono'
+
2005-04-27 Mike Kestner <[EMAIL PROTECTED]>
* Makefile.am : build admin.exe.
Modified: trunk/mono-tools/docbrowser/Makefile.am
===================================================================
--- trunk/mono-tools/docbrowser/Makefile.am 2005-05-08 23:20:09 UTC (rev
44227)
+++ trunk/mono-tools/docbrowser/Makefile.am 2005-05-08 23:27:19 UTC (rev
44228)
@@ -33,8 +33,8 @@
$(MCS) -debug -out:browser.exe $(browser_sources)
-resource:$(srcdir)/monodoc.png,monodoc.png
-resource:$(srcdir)/browser.glade,browser.glade $(browser_assemblies)
b: browser.exe
- MONO_PATH=. mono --debug browser.exe
+ MONO_PATH=. $(RUNTIME) --debug browser.exe
c: admin.exe
- MONO_PATH=. mono --debug admin.exe
+ MONO_PATH=. $(RUNTIME) --debug admin.exe
Modified: trunk/mono-tools/gnunit/ChangeLog
===================================================================
--- trunk/mono-tools/gnunit/ChangeLog 2005-05-08 23:20:09 UTC (rev 44227)
+++ trunk/mono-tools/gnunit/ChangeLog 2005-05-08 23:27:19 UTC (rev 44228)
@@ -1,3 +1,10 @@
+2005-05-08 Ben Maurer <[EMAIL PROTECTED]>
+
+ * src/Makefile.am, script*.in: use @RUNTIME@ rather than
+ @bin_dir@/mono. This is a problem for people who have mono-tools
+ and mono in a different prefix (say you install mono from rpm but
+ want to hack on monodoc).
+
2005-04-23 Mike Kestner <[EMAIL PROTECTED]>
* src/Makefile.am : distcheck fixes.
Modified: trunk/mono-tools/gnunit/src/Makefile.am
===================================================================
--- trunk/mono-tools/gnunit/src/Makefile.am 2005-05-08 23:20:09 UTC (rev
44227)
+++ trunk/mono-tools/gnunit/src/Makefile.am 2005-05-08 23:27:19 UTC (rev
44228)
@@ -55,11 +55,10 @@
gnunit2
REWRITE = sed \
- -e 's,@''bindir@,$(bindir),g' \
-e 's,@''mono_one_instdir@,$(gnunitdir),g' \
-e 's,@''mono_two_instdir@,$(gnunit2dir),g' \
-e 's,@''exe_file@,[EMAIL PROTECTED],g' \
- -e 's,@''mono_interp@,mono --debug,g'
+ -e 's,@''RUNTIME@,@RUNTIME@ --debug,g'
gnunit :
$(REWRITE) $(srcdir)/script.in > [EMAIL PROTECTED]
Modified: trunk/mono-tools/gnunit/src/script.in
===================================================================
--- trunk/mono-tools/gnunit/src/script.in 2005-05-08 23:20:09 UTC (rev
44227)
+++ trunk/mono-tools/gnunit/src/script.in 2005-05-08 23:27:19 UTC (rev
44228)
@@ -1,2 +1,2 @@
#!/bin/sh
-exec @bindir@/@mono_interp@ @mono_one_instdir@/@exe_file@ "$@"
+exec @RUNTIME@ @mono_one_instdir@/@exe_file@ "$@"
Modified: trunk/mono-tools/gnunit/src/script2.in
===================================================================
--- trunk/mono-tools/gnunit/src/script2.in 2005-05-08 23:20:09 UTC (rev
44227)
+++ trunk/mono-tools/gnunit/src/script2.in 2005-05-08 23:27:19 UTC (rev
44228)
@@ -1,2 +1,2 @@
#!/bin/sh
-exec @bindir@/@mono_interp@ @mono_two_instdir@/@exe_file@ "$@"
+exec @RUNTIME@ @mono_two_instdir@/@exe_file@ "$@"
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
