diff options
| author | Ben Maurer <benm@mono-cvs.ximian.com> | 2005-05-09 03:27:19 +0400 |
|---|---|---|
| committer | Ben Maurer <benm@mono-cvs.ximian.com> | 2005-05-09 03:27:19 +0400 |
| commit | 5d59b93bd0d874adbb8cce2a652caf356a429476 (patch) | |
| tree | 234ec570716003c8f7c3c4c7b55b861a576efaba /gnunit | |
| parent | 0b2a7653b72e724d7e9aa72aa84169b244ee126a (diff) | |
In .:
2005-05-08 Ben Maurer <bmaurer@ximian.com>
* 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 <bmaurer@ximian.com>
* 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 <bmaurer@ximian.com>
* 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 <bmaurer@ximian.com>
* Makefile.am: use $(RUNTIME) rather than `mono'
svn path=/trunk/mono-tools/; revision=44228
Diffstat (limited to 'gnunit')
| -rw-r--r-- | gnunit/ChangeLog | 7 | ||||
| -rw-r--r-- | gnunit/src/Makefile.am | 3 | ||||
| -rw-r--r-- | gnunit/src/script.in | 2 | ||||
| -rw-r--r-- | gnunit/src/script2.in | 2 |
4 files changed, 10 insertions, 4 deletions
diff --git a/gnunit/ChangeLog b/gnunit/ChangeLog index 68271c4d..b0197cac 100644 --- a/gnunit/ChangeLog +++ b/gnunit/ChangeLog @@ -1,3 +1,10 @@ +2005-05-08 Ben Maurer <bmaurer@ximian.com> + + * 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 <mkestner@novell.com> * src/Makefile.am : distcheck fixes. diff --git a/gnunit/src/Makefile.am b/gnunit/src/Makefile.am index 591318ac..3034e38b 100644 --- a/gnunit/src/Makefile.am +++ b/gnunit/src/Makefile.am @@ -55,11 +55,10 @@ script_SCRIPTS = \ 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@,$@.exe,g' \ - -e 's,@''mono_interp@,mono --debug,g' + -e 's,@''RUNTIME@,@RUNTIME@ --debug,g' gnunit : $(REWRITE) $(srcdir)/script.in > $@.tmp diff --git a/gnunit/src/script.in b/gnunit/src/script.in index e68eb084..3318dba3 100644 --- a/gnunit/src/script.in +++ b/gnunit/src/script.in @@ -1,2 +1,2 @@ #!/bin/sh -exec @bindir@/@mono_interp@ @mono_one_instdir@/@exe_file@ "$@" +exec @RUNTIME@ @mono_one_instdir@/@exe_file@ "$@" diff --git a/gnunit/src/script2.in b/gnunit/src/script2.in index 0b594f30..5baf3499 100644 --- a/gnunit/src/script2.in +++ b/gnunit/src/script2.in @@ -1,2 +1,2 @@ #!/bin/sh -exec @bindir@/@mono_interp@ @mono_two_instdir@/@exe_file@ "$@" +exec @RUNTIME@ @mono_two_instdir@/@exe_file@ "$@" |