* Microsoft.VisualBasic.VBUtils.txt: Rename from ...

[mono.git] / mcs / build / executable.make

diff --git a/mcs/build/executable.make b/mcs/build/executable.make
index 1ad575b5b263452954c28336393c70da3166cc35..ccbbcc3b1692d768c93b84cf0ec6e9a27cb5d38b 100644 (file)
--- a/mcs/build/executable.make
+++ b/mcs/build/executable.make
@@ -18,39 +18,42 @@ response = $(depsdir)/$(base_prog).response
 executable_CLEAN_FILES += $(response)
 endif
 
-makefrag = $(depsdir)/$(base_prog).makefrag
+makefrag = $(depsdir)/$(PROFILE)_$(base_prog).makefrag
 pdb = $(patsubst %.exe,%.pdb,$(PROGRAM))
 mdb = $(patsubst %.exe,%.mdb,$(PROGRAM))
 executable_CLEAN_FILES += $(makefrag) $(pdb) $(mdb)
 
 all-local: $(PROGRAM) $(PROGRAM_config)
 
+install-local: all-local
+test-local: all-local
+uninstall-local:
+
 ifdef NO_INSTALL
 install-local uninstall-local:
        @:
 else
 
 ifndef PROGRAM_INSTALL_DIR
-PROGRAM_INSTALL_DIR = $(prefix)/bin
+PROGRAM_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
 endif
 
-
 install-local: $(PROGRAM) $(PROGRAM_config)
        $(MKINSTALLDIRS) $(DESTDIR)$(PROGRAM_INSTALL_DIR)
        $(INSTALL_BIN) $(PROGRAM) $(DESTDIR)$(PROGRAM_INSTALL_DIR)
-       -$(INSTALL_BIN) $(PROGRAM).mdb $(DESTDIR)$(PROGRAM_INSTALL_DIR)
+       test ! -f $(PROGRAM).mdb || $(INSTALL_BIN) $(PROGRAM).mdb $(DESTDIR)$(PROGRAM_INSTALL_DIR)
 ifdef PROGRAM_config
        $(INSTALL_DATA) $(PROGRAM_config) $(DESTDIR)$(PROGRAM_INSTALL_DIR)
 endif
 
 uninstall-local:
-       -rm -f $(DESTDIR)$(PROGRAM_INSTALL_DIR)/$(base_prog) $(DESTDIR)$(PROGRAM_INSTALL_DIR)/$(base_prog).mdb
+       -rm -f $(DESTDIR)$(PROGRAM_INSTALL_DIR)/$(base_prog) $(DESTDIR)$(PROGRAM_INSTALL_DIR)/$(base_prog).mdb $(DESTDIR)$(PROGRAM_INSTALL_DIR)/$(base_prog).config
 endif
 
 clean-local:
        -rm -f $(executable_CLEAN_FILES) $(CLEAN_FILES)
 
-test-local: $(PROGRAM)
+test-local:
        @:
 run-test-local:
        @:
@@ -73,7 +76,7 @@ $(PROGRAM): $(BUILT_SOURCES) $(EXTRA_SOURCES) $(response)
        $(PROGRAM_COMPILE) /target:exe /out:$(base_prog) $(BUILT_SOURCES) $(EXTRA_SOURCES) @$(response)
 ifneq ($(base_prog),$(PROGRAM))
        mv $(base_prog) $(PROGRAM)
-       -mv $(base_prog).mdb $(PROGRAM).mdb
+       test ! -f $(base_prog).mdb || mv $(base_prog).mdb $(PROGRAM).mdb
 endif
 
 ifdef PROGRAM_config