2004-06-16 Atsushi Enomoto <atsushi@ximian.com>

	* library.make : Added GACDIR. Use cygpath -w on windows.

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

diff --git a/mcs/build/ChangeLog b/mcs/build/ChangeLog
index 510ff14c848e969d9273e02a717b8a56b27fd100..ebac0a437de5fdbd37d6457e4904c05588660a31 100644 (file)
--- a/mcs/build/ChangeLog
+++ b/mcs/build/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-16  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * library.make : Added GACDIR. Use cygpath -w on windows.
+
 2004-06-14  Raja R Harinath  <rharinath@novell.com>
 
        * platforms/linux.make (PLATFORM_CHANGE_SEPARATOR_CMD): Define to 'cat'.

diff --git a/mcs/build/library.make b/mcs/build/library.make
index d477f3c7d9aed1ecb8bafb0211597eaf1904a5b6..152f2620280817d60618339dbbd7faeef23cfe80 100644 (file)
--- a/mcs/build/library.make
+++ b/mcs/build/library.make
@@ -80,6 +80,12 @@ ifeq ($(PROFILE), net_2_0)
 PACKAGE = 2.0
 endif
 
+ifeq ($(PLATFORM), win32)
+GACDIR = `cygpath -w $(DESTDIR)$(prefix)/lib`
+else
+GACDIR = $(DESTDIR)$(prefix)/lib`
+endif
+
 all-local: $(the_lib)
 
 install-local: $(the_lib) maybe-sign-lib
@@ -95,7 +101,7 @@ uninstall-local:
 else
 
 install-local: $(gacutil)
-       $(RUNTIME) $(gacutil) /i $(the_lib) /f /root $(DESTDIR)$(prefix)/lib /package $(PACKAGE)
+       $(RUNTIME) $(gacutil) /i $(the_lib) /f /root $(GACDIR) /package $(PACKAGE)
 
 uninstall-local: $(gacutil)
        $(RUNTIME) $(gacutil) /u $(LIBRARY_NAME:.dll=)