Author: benm
Date: 2005-05-07 18:37:58 -0400 (Sat, 07 May 2005)
New Revision: 44211
Modified:
trunk/xsp/ChangeLog
trunk/xsp/configure.in
trunk/xsp/scripts/Makefile.am
trunk/xsp/scripts/script.in
trunk/xsp/server/Makefile.am
trunk/xsp/tools/asp_state/Makefile.am
trunk/xsp/tools/dbsessmgr/Makefile.am
Log:
2005-05-07 Ben Maurer <[EMAIL PROTECTED]>
* configure.in: put the full path to mono in RUNTIME
* */Makefile.am: s.$libdir.$prefix/lib, since that's what mono
uses. Also, for scripts, use RUNTIME rather than just `mono'.
Modified: trunk/xsp/ChangeLog
===================================================================
--- trunk/xsp/ChangeLog 2005-05-07 22:22:47 UTC (rev 44210)
+++ trunk/xsp/ChangeLog 2005-05-07 22:37:58 UTC (rev 44211)
@@ -1,3 +1,9 @@
+2005-05-07 Ben Maurer <[EMAIL PROTECTED]>
+
+ * configure.in: put the full path to mono in RUNTIME
+ * */Makefile.am: s.$libdir.$prefix/lib, since that's what mono
+ uses. Also, for scripts, use RUNTIME rather than just `mono'.
+
2005-05-07 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
* server/ModMonoWorkerRequest.cs: implemented IsClientConnected.
Modified: trunk/xsp/configure.in
===================================================================
--- trunk/xsp/configure.in 2005-05-07 22:22:47 UTC (rev 44210)
+++ trunk/xsp/configure.in 2005-05-07 22:37:58 UTC (rev 44211)
@@ -9,6 +9,7 @@
AC_PATH_PROG(CSC, csc, no)
AC_PATH_PROG(MCS, mcs, no)
AC_PATH_PROG(GMCS, gmcs, no)
+AC_PATH_PROG(RUNTIME, mono, no)
CS="C#"
if test "x$CSC" = "xno" -a "x$MCS" = "xno" ; then
dnl AC_MSG_ERROR([You need to install a C# compiler])
Modified: trunk/xsp/scripts/Makefile.am
===================================================================
--- trunk/xsp/scripts/Makefile.am 2005-05-07 22:22:47 UTC (rev 44210)
+++ trunk/xsp/scripts/Makefile.am 2005-05-07 22:37:58 UTC (rev 44211)
@@ -10,16 +10,18 @@
CLEANFILES = $(bin1_scripts) $(bin2_scripts_real)
-plat_bindir = $(libdir)/mono/1.0
-plat_bindir2 = $(libdir)/mono/2.0
+plat_bindir = $(prefix)/lib/mono/1.0
+plat_bindir2 = $(prefix)/lib/mono/2.0
REWRITE = sed \
-e 's,@''plat_bindir@,$(plat_bindir),g' \
- -e 's,@''exe_file@,[EMAIL PROTECTED],g'
+ -e 's,@''exe_file@,[EMAIL PROTECTED],g' \
+ -e 's,@''RUNTIME@,@RUNTIME@,g'
REWRITE2 = sed \
-e 's,@''plat_bindir@,$(plat_bindir2),g' \
- -e 's,@''exe_file@,[EMAIL PROTECTED],g'
+ -e 's,@''exe_file@,[EMAIL PROTECTED],g' \
+ -e 's,@''RUNTIME@,@RUNTIME@,g'
$(bin1_scripts): $(srcdir)/script.in Makefile.am
$(REWRITE) $(srcdir)/script.in > [EMAIL PROTECTED]
Modified: trunk/xsp/scripts/script.in
===================================================================
--- trunk/xsp/scripts/script.in 2005-05-07 22:22:47 UTC (rev 44210)
+++ trunk/xsp/scripts/script.in 2005-05-07 22:37:58 UTC (rev 44211)
@@ -1,2 +1,2 @@
#!/bin/sh
-exec mono "@plat_bindir@/@exe_file@" "$@"
+exec @RUNTIME@ "@plat_bindir@/@exe_file@" "$@"
Modified: trunk/xsp/server/Makefile.am
===================================================================
--- trunk/xsp/server/Makefile.am 2005-05-07 22:22:47 UTC (rev 44210)
+++ trunk/xsp/server/Makefile.am 2005-05-07 22:37:58 UTC (rev 44211)
@@ -1,9 +1,9 @@
MCSFLAGS= -debug+ -debug:full -nologo
-xspdir = $(libdir)/mono/1.0
-modmonoserverdir = $(libdir)/mono/1.0
-xsp2dir = $(libdir)/mono/2.0
-modmonoserver2dir = $(libdir)/mono/2.0
+xspdir = $(prefix)/lib/mono/1.0
+modmonoserverdir = $(prefix)/lib/mono/1.0
+xsp2dir = $(prefix)/lib/mono/2.0
+modmonoserver2dir = $(prefix)/lib/mono/2.0
if NET_2_0
XSP2_EXE = xsp2.exe
@@ -25,7 +25,7 @@
#
xsp_references= -r:System.Web.dll
if PLATFORM_WIN32
-modmono_references= -lib:"$(libdir)" -r:System.Web.dll -r:Mono.Posix.dll
+modmono_references= -lib:"$(prefix)/lib" -r:System.Web.dll -r:Mono.Posix.dll
else
modmono_references= -r:System.Web.dll -r:Mono.Posix.dll
endif
Modified: trunk/xsp/tools/asp_state/Makefile.am
===================================================================
--- trunk/xsp/tools/asp_state/Makefile.am 2005-05-07 22:22:47 UTC (rev
44210)
+++ trunk/xsp/tools/asp_state/Makefile.am 2005-05-07 22:37:58 UTC (rev
44211)
@@ -1,12 +1,12 @@
MCSFLAGS= -debug+ -debug:full -nologo
-aspstatedir = $(libdir)/mono/1.0
+aspstatedir = $(prefix)/lib/mono/1.0
aspstate_SCRIPTS = asp-state.exe asp-state.exe.config
if NET_2_0
scripts2 = asp-state2.exe asp-state2.exe.config
endif
-aspstate2dir = $(libdir)/mono/2.0
+aspstate2dir = $(prefix)/lib/mono/2.0
aspstate2_SCRIPTS = $(scripts2)
EXTRA_DIST = $(aspstate_input) asp-state.exe.config asp-state2.exe.config
Modified: trunk/xsp/tools/dbsessmgr/Makefile.am
===================================================================
--- trunk/xsp/tools/dbsessmgr/Makefile.am 2005-05-07 22:22:47 UTC (rev
44210)
+++ trunk/xsp/tools/dbsessmgr/Makefile.am 2005-05-07 22:37:58 UTC (rev
44211)
@@ -1,12 +1,12 @@
MCSFLAGS= -debug+ -debug:full -nologo
-dbsessmgrdir = $(libdir)/mono/1.0
+dbsessmgrdir = $(prefix)/lib/mono/1.0
dbsessmgr_SCRIPTS = dbsessmgr.exe dbsessmgr.exe.config
if NET_2_0
scripts2 = dbsessmgr2.exe dbsessmgr2.exe.config
endif
-dbsessmgr2dir = $(libdir)/mono/2.0
+dbsessmgr2dir = $(prefix)/lib/mono/2.0
dbsessmgr2_SCRIPTS = $(scripts2)
EXTRA_DIST = $(dbsessmgr_input) dbsessmgr.exe.config dbsessmgr2.exe.config
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
