[m-rev.] for review: improve the bindist for the .NET backend.

[Tyson Dowd]

And here is the relative diff I am about to commit.


diff -u bindist/bindist.Makefile.in bindist/bindist.Makefile.in
--- bindist/bindist.Makefile.in
+++ bindist/bindist.Makefile.in
@@ -35,7 +35,9 @@
 
 EXT_FOR_EXE		= @EXT_FOR_EXE@
 
-ILASM			= @ILASM@
+FULLARCH		= @FULLARCH@
+
+GACUTIL			= @GACUTIL@
 
 UTIL_PROGS		= util/mkinit util/mdemangle
 UTIL_PROGFILENAMES	= $(UTIL_PROGS:%=%$(EXT_FOR_EXE))
@@ -142,12 +144,12 @@
 	test -d $(INSTALL_BINDIR) || mkdir -p $(INSTALL_BINDIR)
 	cp $(UTILS) $(INSTALL_BINDIR)
 
-ifeq ($(ILASM),ilasm)        
+ifneq ("$(strip $(GACUTIL))","")
 .PHONY: install_gac
 install_gac: 
-	-if test -d $(INSTALL_LIBDIR)/lib/ilc/ ; then 		\
-		cd $(INSTALL_LIBDIR)/lib/ilc/i686-pc-cygwin/ ;	\
-		gacutil -i mercury.dll ; 			\
+	if test -d $(INSTALL_LIBDIR)/lib/ilc/ ; then 		\
+		cd $(INSTALL_LIBDIR)/lib/ilc/$(FULLARCH) &&	\
+		$(GACUTIL) -i mercury.dll ; 			\
 	fi
 else
 .PHONY: install_gac
only in patch2:
--- aclocal.m4	2001/06/14 22:36:13	1.5
+++ aclocal.m4	2001/08/08 13:39:58
@@ -71,6 +71,7 @@
 AC_DEFUN(MERCURY_CHECK_DOTNET,
 [
 AC_PATH_PROG(ILASM, ilasm)
+AC_PATH_PROG(GACUTIL, gacutil)
 
 AC_MSG_CHECKING(for Microsoft.NET Framework SDK)
 AC_CACHE_VAL(mercury_cv_microsoft_dotnet, [
@@ -86,6 +87,7 @@
 ])
 AC_MSG_RESULT($mercury_cv_microsoft_dotnet)
 ILASM=`basename "$ILASM"`
+GACUTIL=`basename "$GACUTIL"`
 
 AC_PATH_PROG(MS_CL, cl)
 AC_MSG_CHECKING(for Microsoft.NET Visual C++)
@@ -104,6 +106,7 @@
 MS_CL=`basename "$MS_CL"`
 
 AC_SUBST(ILASM)
+AC_SUBST(GACUTIL)
 AC_SUBST(MS_CL)
 AC_SUBST(MS_DOTNET_SDK_DIR)
 AC_SUBST(MS_VISUALCPP_DIR)

--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------