X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=scripts%2FMakefile.am;h=be4d6b164a009018668e73beac1c186eb1666e03;hb=54bb28c8a70b551af4d6fe45794ff209826b7ad7;hp=daa0204872fd02cd37ad869315971341156c7487;hpb=811674bc6331c98d33134e2a37a7c7dd66402227;p=mono.git

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index daa0204872f..be4d6b164a0 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -39,7 +39,7 @@ bin_SCRIPTS = \
 	mono-heapviz		\
 	$(scripts_mono_configuration_crypto)
 
-if INSTALL_4_5
+if INSTALL_4_x
 bin_SCRIPTS += $(scripts_4_0)
 bin_SCRIPTS += dmcs
 bin_SCRIPTS += xbuild
@@ -84,6 +84,7 @@ scripts_4_0 = \
 	mod$(SCRIPT_SUFFIX)			\
 	monolinker$(SCRIPT_SUFFIX)		\
 	mono-api-info$(SCRIPT_SUFFIX) 		\
+	mono-api-html$(SCRIPT_SUFFIX) 		\
 	mono-shlib-cop$(SCRIPT_SUFFIX) 		\
 	mozroots$(SCRIPT_SUFFIX)		\
 	permview$(SCRIPT_SUFFIX)		\
@@ -185,14 +186,9 @@ REWRITE_COMMON = sed \
 
 REWRITE = $(REWRITE_COMMON) -e 's,@''mono_interp@,$(mono_interp),g'
 REWRITE_DEBUG = $(REWRITE_COMMON) -e 's,@''mono_interp@,$(mono_interp) --debug,g'
-REWRITE2_DEBUG = $(REWRITE_DEBUG) -e 's,@''framework_version@,2.0,g'
 
-REWRITE2 = $(REWRITE) -e 's,@''framework_version@,2.0,g'
-REWRITE2_1 = $(REWRITE) -e 's,@''framework_version@,2.1,g'
-if INSTALL_4_5
 REWRITE4 = $(REWRITE) -e 's,@''framework_version@,4.5,g'
 REWRITE4_DEBUG = $(REWRITE_DEBUG) -e 's,@''framework_version@,4.5,g'
-endif
 
 peverify: peverify.in Makefile
 	$(REWRITE_COMMON) $(srcdir)/peverify.in > $@.tmp
@@ -211,7 +207,7 @@ mono-service: mono-service.in Makefile
 	mv -f $@.tmp $@
 
 mono-service2: mono-service.in Makefile
-	$(REWRITE2) -e 's,@''exe_name@,$@,g' $(srcdir)/mono-service.in > $@.tmp
+	$(REWRITE4) -e 's,@''exe_name@,$@,g' $(srcdir)/mono-service.in > $@.tmp
 	mv -f $@.tmp $@
 
 nunit-console$(SCRIPT_SUFFIX): $(SCRIPT_IN) Makefile
@@ -219,7 +215,7 @@ nunit-console$(SCRIPT_SUFFIX): $(SCRIPT_IN) Makefile
 	mv -f $@.tmp $@
 
 nunit-console2$(SCRIPT_SUFFIX): $(SCRIPT_IN) Makefile
-	$(REWRITE2_DEBUG) -e 's,@''exe_name@,nunit-console,g' $(srcdir)/$(SCRIPT_IN) | $(FILTER) > $@.tmp
+	$(REWRITE4_DEBUG) -e 's,@''exe_name@,nunit-console,g' $(srcdir)/$(SCRIPT_IN) | $(FILTER) > $@.tmp
 	mv -f $@.tmp $@
 
 nunit-console4$(SCRIPT_SUFFIX): $(SCRIPT_IN) Makefile
@@ -232,7 +228,7 @@ xbuild: xbuild.in Makefile
 
 #FIXME: this is not the correct rule for mod.bat.
 mod$(SCRIPT_SUFFIX): mod.in Makefile
-	$(REWRITE2) -e "s,@""exe_name@,mod,g" $(srcdir)/mod.in > $@.tmp
+	$(REWRITE4) -e "s,@""exe_name@,mod,g" $(srcdir)/mod.in > $@.tmp
 	mv -f $@.tmp $@
 
 #FIXME: this is not the correct rule for bat files.