* library.make: Use the proper runtime, make sure gacutil is

	built.

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

diff --git a/mcs/build/ChangeLog b/mcs/build/ChangeLog
index fb4ec413a3d992f319493dcbb00538a6e10e1835..64c7ebbec5de3270217ccb8d96d72b294cc9c734 100644 (file)
--- a/mcs/build/ChangeLog
+++ b/mcs/build/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-28  Jackson Harper  <jackson@ximian.com>
+
+       * library.make: Use the proper runtime, make sure gacutil is
+       built.
+       
 2004-04-28  Jackson Harper  <jackson@ximian.com>
 
        * library.make: Install these bad actors to the GAC.

diff --git a/mcs/build/library.make b/mcs/build/library.make
index bc33ff685820682789a90f5e3587c06a2a8574fb..891683c702479fae542f12722ced6f38ddb2fea3 100644 (file)
--- a/mcs/build/library.make
+++ b/mcs/build/library.make
@@ -29,23 +29,28 @@ test_stampfile = $(depsdir)/$(PROFILE)_$(test_lib).stamp
 test_flags = /r:$(the_lib) /r:$(topdir)/class/lib/$(PROFILE)/NUnit.Framework.dll $(TEST_MCS_FLAGS)
 endif
 
+gacutil = $(topdir)/tools/gacutil/gacutil.exe
+
 all-local: $(the_lib)
 
-install-local: $(the_lib)
+install-local: $(the_lib) gacutil
        @if test -f Assembly/AssemblyInfo.cs ; then \
-               gacutil /i $(the_lib) /f || exit 1 ; \
+               $(PLATFORM_RUNTIME)  $(gacutil) /i $(the_lib) /f || exit 1 ; \
        else \
                $(MKINSTALLDIRS) $(DESTDIR)$(prefix)/lib ; \
                $(INSTALL_LIB) $(the_lib) $(DESTDIR)$(prefix)/lib ; \
        fi
 
-uninstall-local:
+uninstall-local: gacutil
        @if test -f Assembly/AssemblyInfo.cs ; then \
-               gacutil /u $(the_lib) /f ; \
+               $(PLATFORM_RUNTIME)  $(gacutil) /u $(the_lib) /f ; \
        else \
                -rm -f $(DESTDIR)$(prefix)/lib/$(LIBRARY)
        fi
 
+gacutil:
+       cd $(topdir)/tools/gacutil && $(MAKE) || exit 1 ;
+
 clean-local:
        -rm -f $(the_lib) $(makefrag) $(test_lib) \
               $(test_makefrag) $(test_response) \