* library.make (gacdir_flag): New. Disable /gacdir flag if

RUNTIME_HAS_CONSISTENT_GACDIR flag is set.
(install-local): Use it.

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

diff --git a/mcs/build/ChangeLog b/mcs/build/ChangeLog
index 4729dde830db0d063cc43393ff52863e1d4d9dd7..b5985d4af55020db90ec6993c65bec9ac5331c80 100644 (file)
--- a/mcs/build/ChangeLog
+++ b/mcs/build/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-03  Raja R Harinath  <rharinath@novell.com>
+
+       * library.make (gacdir_flag): New.  Disable /gacdir flag if
+       RUNTIME_HAS_CONSISTENT_GACDIR flag is set.
+       (install-local): Use it.
+
 2004-11-30  Raja R Harinath  <rharinath@novell.com>
 
        * executable.make (makefrag): Make profile-specific.

diff --git a/mcs/build/library.make b/mcs/build/library.make
index baae2d25546a02cc048cc3dfb287b0976b6e0b0e..0ed9f3a3f07e628e4aa7ee4c05a6ec0aa3716c9b 100644 (file)
--- a/mcs/build/library.make
+++ b/mcs/build/library.make
@@ -116,8 +116,21 @@ uninstall-local:
 
 else
 
+# If RUNTIME_HAS_CONSISTENT_GACDIR is set, it implies that the internal GACDIR
+# of the runtime is the same as the GACDIR we want.  So, we don't need to pass it
+# to gacutil.  Note that the GACDIR we want may not be the same as the value of 
+# GACDIR set above, since the user could have overridden the value of $(prefix).
+#
+# This makes a difference only when we're building from the mono/ tree, since we
+# have to ensure that the internal GACDIR of the in-tree runtime matches where we 
+# install the DLLs.
+
+ifndef RUNTIME_HAS_CONSISTENT_GACDIR
+gacdir_flag = /gacdir $(GACDIR)
+endif
+
 install-local: $(gacutil)
-       $(GACUTIL) /i $(the_lib) /f /gacdir $(GACDIR) /root $(GACROOT) /package $(FRAMEWORK_VERSION)
+       $(GACUTIL) /i $(the_lib) /f $(gacdir_flag) /root $(GACROOT) /package $(FRAMEWORK_VERSION)
 
 uninstall-local: $(gacutil)
        $(GACUTIL) /u $(LIBRARY_NAME:.dll=)