* scripts/Makefile.am: Add mod.

svn path=/trunk/mono/; revision=116318

diff --git a/ChangeLog b/ChangeLog
index 36d3ec4dec0b3606fed6fee20957f39e1ffa8f43..3e45c6d86eaf1ea0c43056d9f650579cd8f3d8c2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-16  Jonathan Pryor  <jpryor@novell.com>
+
+       * scripts/Makefile.am: Add mod.
+
 2008-10-16  Jonathan Pryor  <jpryor@novell.com>
 
        * scripts/Makefile.am: Move mono-shlib-cop to scripts_2_0.

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 8e78bb62be85b0a8f2cae880c9bb781444d9ac0b..5d12dde9f2e58d5490e3b7b95cab8f35e6a2c93c 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -35,6 +35,7 @@ bin_SCRIPTS = \
        $(scripts_service)      \
        $(scripts_nunit)        \
        $(scripts_rpmhelpers)   \
+       mod                     \
        mono-test-install
 
 scripts_1_0_compat = \
@@ -90,6 +91,7 @@ scripts_2_0 = \
        ilasm2$(SCRIPT_SUFFIX)                  \
        mconfig$(SCRIPT_SUFFIX)                 \
        mkbundle2$(SCRIPT_SUFFIX)               \
+       mdoc$(SCRIPT_SUFFIX)                    \
        mono-api-info2$(SCRIPT_SUFFIX)          \
        mono-shlib-cop$(SCRIPT_SUFFIX)          \
        monop2$(SCRIPT_SUFFIX)                  \
@@ -121,7 +123,7 @@ scripts_service = mono-service mono-service2
 scripts_nunit = nunit-console$(SCRIPT_SUFFIX) nunit-console2$(SCRIPT_SUFFIX)
 scripts_rpmhelpers = mono-find-provides mono-find-requires
 
-CLEANFILES = $(scripts_1_0) $(scripts_1_0_umask) $(scripts_2_0) $(scripts_2_1) $(scripts_defaults) $(scripts_1_0_compat) mono-service mono-service2 nunit-console nunit-console2 mono-find-provides mono-find-requires 
+CLEANFILES = $(scripts_1_0) $(scripts_1_0_umask) $(scripts_2_0) $(scripts_2_1) $(scripts_defaults) $(scripts_1_0_compat) mono-service mono-service2 nunit-console nunit-console2 mono-find-provides mono-find-requires mod
 DISTCLEANFILES = $(pkgconfig_DATA) $(scripts_rpmhelpers)
 
 EXTRA_DIST =                   \
@@ -131,6 +133,7 @@ EXTRA_DIST =                        \
        script_umask.bat.in     \
        smcs.in                 \
        smcs.bat.in             \
+       mod.in                  \
        mono-service.in         \
        mono-find-provides.in   \
        mono-find-requires.in   \
@@ -193,6 +196,10 @@ smcs$(SCRIPT_SUFFIX): $(SMCS_IN) Makefile
        $(REWRITE2_1) -e "s,@""exe_name@,smcs,g" $(srcdir)/$(SMCS_IN) | $(FILTER) > $@.tmp
        mv $@.tmp $@
 
+mod$(SCRIPT_SUFFIX): mod.in Makefile
+       $(REWRITE2) -e "s,@""exe_name@,mod,g" $(srcdir)/mod.in > $@.tmp
+       mv $@.tmp $@
+
 $(scripts_1_0): $(SCRIPT_IN) Makefile
        $(REWRITE1) -e 's,@''exe_name@,$@,g' $(srcdir)/$(SCRIPT_IN) | $(FILTER) > $@.tmp
        mv $@.tmp $@

diff --git a/scripts/mod.in b/scripts/mod.in
index 0213d056fa6bc509541c5c329032722b3b4cc483..652ea0c7afb07d9c7c956d013db029c7511aa3a4 100644 (file)
--- a/scripts/mod.in
+++ b/scripts/mod.in
@@ -9,11 +9,13 @@ if test "x$1" = x; then
     exit 1;
 fi
 
+MOD="@bindir@/@mono_interp@ $MONO_OPTIONS @mono_instdir@/@framework_version@/@exe_name@.exe"
+
 if `which lynx >& /dev/null` > /dev/null; then
-    @RUNTIME@ $monodocdir/mod.exe "$1" | lynx -dump -stdin -force_html | ${PAGER:-more}
+    $MOD "$1" | lynx -dump -stdin -force_html | ${PAGER:-more}
 else
     tmp=$HOME/.monodoc-tmp-$$
-    @RUNTIME@ $monodocdir/mod.exe "$1" > $tmp
+    $MOD "$1" > $tmp
     links -dump -force-html $tmp | ${PAGER:-more}
     rm $tmp
 fi