* library.make (LIBRARY_COMPILE): New define.

($(the_lib)): Use $(LIBRARY_COMPILE) to compile $(the_lib).

* executable.make (uninstall-local): Use PROGRAM_INSTALL_DIR.

svn path=/trunk/mcs/; revision=27949

diff --git a/mcs/build/ChangeLog b/mcs/build/ChangeLog
index b1d78f6d996ec701859547b3f7a14d4366f347de..2c67dbd22a325126566775070df45ed8602fc396 100644 (file)
--- a/mcs/build/ChangeLog
+++ b/mcs/build/ChangeLog
@@ -1,7 +1,11 @@
 2004-05-24  Raja R Harinath  <rharinath@novell.com>
 
+       * library.make (LIBRARY_COMPILE): New define.
+       ($(the_lib)): Use $(LIBRARY_COMPILE) to compile $(the_lib).
+
        * executable.make (PROGRAM_INSTALL_DIR): Allow makefile to specify
        a different directory for installation.
+       (install-local, uninstall-local): Use it.
 
 2004-05-20  Raja R Harinath  <rharinath@novell.com>
 

diff --git a/mcs/build/executable.make b/mcs/build/executable.make
index 2875f5cd736dbd756529794bb6a65b5190e90227..6a960006f0a1a63d6c5af09f1eeaf29af67d5e1b 100644 (file)
--- a/mcs/build/executable.make
+++ b/mcs/build/executable.make
@@ -28,7 +28,7 @@ install-local: $(PROGRAM)
        $(INSTALL_BIN) $(PROGRAM) $(DESTDIR)$(PROGRAM_INSTALL_DIR)
 
 uninstall-local:
-       -rm -f $(DESTDIR)$(prefix)/bin/$(base_prog)
+       -rm -f $(DESTDIR)$(PROGRAM_INSTALL_DIR)/$(base_prog)
 
 clean-local:
        -rm -f *.exe $(BUILT_SOURCES) $(CLEAN_FILES) $(pdb) $(stampfile) $(makefrag)

diff --git a/mcs/build/library.make b/mcs/build/library.make
index 3777890f9b201c15afb6126e17a5522fab5901d4..de8136f0dd2756e003ecd2354c833e0b658c1dc7 100644 (file)
--- a/mcs/build/library.make
+++ b/mcs/build/library.make
@@ -95,10 +95,14 @@ dist-local: dist-default
            $(MKINSTALLDIRS) $$dest && cp $$f $$dest || exit 1 ; \
        done
 
+ifndef LIBRARY_COMPILE
+LIBRARY_COMPILE = $(CSCOMPILE)
+endif
+
 # Fun with dependency tracking
 
 $(the_lib): $(makefrag) $(stampfile) $(response)
-       $(CSCOMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) /target:library /out:$@ @$(response)
+       $(LIBRARY_COMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) /target:library /out:$@ @$(response)
 
 # warning: embedded tab in the 'echo touch' line
 $(makefrag): $(sourcefile)