[Mono-list] [PATCH] Fix mono/runtime/net_1_1/Makefile.am to call gacutil with proper arguments

[Omar Kilani]

This is a multi-part message in MIME format.
--------------020108020900040609030602
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit

Hello,

The current mono/runtime/net_1_1/Makefile.am file calls gacutil.exe with 
/gacdir $(GAC_DIR). This is broken, as gacutil.exe will then make a 
symlink into the gac in $(GAC_DIR), and if building in a RPM package, 
will create a symlink inside the build root.

Attached patch fixes this issue by using $(libdir) as /gacdir.

Regards,
Omar Kilani

--------------020108020900040609030602
Content-Type: text/plain;
 name="mono-cvs-runtime-net_1_1-Makefile-am.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="mono-cvs-runtime-net_1_1-Makefile-am.patch"

Index: mono/runtime/net_1_1/Makefile.am
===================================================================
RCS file: /mono/mono/runtime/net_1_1/Makefile.am,v
retrieving revision 1.41
diff -u -r1.41 Makefile.am
--- mono/runtime/net_1_1/Makefile.am	23 Jun 2004 09:59:27 -0000	1.41
+++ mono/runtime/net_1_1/Makefile.am	25 Jun 2004 06:25:52 -0000
@@ -88,17 +88,17 @@
 install-data-local:
 	@if test -n '$(gac_assemblies)'; then \
 	  for i in ''$(gac_assemblies); do \
-	    echo "MONO_PATH=$(srcdir) $(DESTDIR)$(bindir)/mono $(gacutil) /i $(srcdir)/$$i /f /package 1.0 /gacdir $(GAC_DIR) /root $(GAC_DIR)" ; \
+	    echo "MONO_PATH=$(srcdir) $(DESTDIR)$(bindir)/mono $(gacutil) /i $(srcdir)/$$i /f /package 1.0 /gacdir $(libdir) /root $(GAC_DIR)" ; \
 	    MONO_PATH=$(srcdir) \
-	      $(LIBTOOL) --mode=execute $(DESTDIR)$(bindir)/mono $(gacutil) /i $(srcdir)/$$i /f /package 1.0 /gacdir $(GAC_DIR) /root $(GAC_DIR) || exit 1 ; \
+	      $(LIBTOOL) --mode=execute $(DESTDIR)$(bindir)/mono $(gacutil) /i $(srcdir)/$$i /f /package 1.0 /gacdir $(libdir) /root $(GAC_DIR) || exit 1 ; \
 	  done; fi
 
 uninstall-local:
 	@if test -n '$(gac_assemblies_list)'; then \
 	  for i in ''$(gac_assemblies_list); do \
-	    echo "MONO_PATH=$(srcdir) $(mono_runtime) $(gacutil) /u $$i /gacdir $(GAC_DIR) /root $(GAC_DIR)" ; \
+	    echo "MONO_PATH=$(srcdir) $(DESTDIR)$(bindir) $(gacutil) /u $$i /gacdir $(libdir) /root $(GAC_DIR)" ; \
 	    MONO_PATH=$(srcdir) \
-	      $(LIBTOOL) --mode=execute $(DESTDIR)$(bindir)/mono $(gacutil) /u $$i /gacdir $(GAC_DIR) /root $(GAC_DIR) || true ; \
+	      $(LIBTOOL) --mode=execute $(DESTDIR)$(bindir)/mono $(gacutil) /u $$i /gacdir $(libdir) /root $(GAC_DIR) || true ; \
 	  done; fi
 
 copy_dlls:

--------------020108020900040609030602--