2005-06-02 Ben Maurer <bmaurer@ximian.com>

* src/Mono.WebServer/Makefile.am: Handle gacutil and destdir correctly. * configure.in: GACUTIL flags svn path=/trunk/xsp/; revision=45335
mono · Jun 2, 2005 · eb39a82 · eb39a82
1 parent 1cd249a
commit eb39a82
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2005-06-02  Ben Maurer  <bmaurer@ximian.com>
+
+	* src/Mono.WebServer/Makefile.am: Handle gacutil and destdir
+	correctly.
+
+	* configure.in: GACUTIL flags
+
 2005-06-01 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* configure.in:

diff --git a/configure.in b/configure.in
@@ -11,6 +11,10 @@ if test "x$GACUTIL" = "xno" ; then
 	AC_MSG_ERROR([No gacutil tool found])
 fi
 
+GACUTIL_FLAGS='/gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib'
+
+AC_SUBST(GACUTIL_FLAGS)
+
 
 AC_PATH_PROG(CSC, csc, no)
 AC_PATH_PROG(MCS, mcs, no)

diff --git a/src/Mono.WebServer/Makefile.am b/src/Mono.WebServer/Makefile.am
@@ -34,8 +34,8 @@ Mono.WebServer.dll: $(monowebserver_build_sources) key.snk
 	$(MCS) $(MCSFLAGS) $(monowebserver_references) /target:library /out:$@ $(monowebserver_build_sources)
 
 install-data-local:
-	$(GACUTIL) -i Mono.WebServer.dll
+	$(GACUTIL) $(GACUTIL_FLAGS) -i Mono.WebServer.dll 
 
 uninstall-local:
-	$(GACUTIL) -u Mono.WebServer
+	$(GACUTIL) $(GACUTIL_FLAGS) -u Mono.WebServer