Attachment 292906 Details for Bug 430173 – New patch against xsp

[patch] New patch against xsp

xsp-1.2.6.patch (text/plain), 3.99 KB, created by Eric Moret on 2008-01-25 02:47:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Moret

Created: 2008-01-25 02:47:58 UTC

Size: 3.99 KB

patch

obsolete

>diff -ruN xsp-1.2.6.orig/configure xsp-1.2.6/configure
>--- xsp-1.2.6.orig/configure	2007-12-06 11:16:32.000000000 -0800
>+++ xsp-1.2.6/configure	2008-01-24 16:17:07.000000000 -0800
>@@ -2767,7 +2767,7 @@
> echo "$CS compiler: $MCS"
> test x$GMCS = xno || echo "$CS 2.0 compiler: $GMCS"
> 
>-GACUTIL_FLAGS='-root $(DESTDIR)$(prefix)/lib'
>+GACUTIL_FLAGS='-root $(DESTDIR)$(libdir)'
> 
> # Put the version in the new required format (for svn revisions)
> export VERSION
>diff -ruN xsp-1.2.6.orig/scripts/Makefile.am xsp-1.2.6/scripts/Makefile.am
>--- xsp-1.2.6.orig/scripts/Makefile.am	2007-11-08 15:00:41.000000000 -0800
>+++ xsp-1.2.6/scripts/Makefile.am	2008-01-24 16:10:41.000000000 -0800
>@@ -12,10 +12,10 @@
> 
> CLEANFILES = $(bin1_scripts) $(bin2_scripts_real) $(tool_scripts) $(tool2_scripts)
> 
>-plat_bindir = $(prefix)/lib/mono/1.0
>-plat_bindir2 = $(prefix)/lib/mono/2.0
>-plat_tooldir = $(prefix)/lib/xsp/1.0
>-plat_tooldir2 = $(prefix)/lib/xsp/2.0
>+plat_bindir = $(libdir)/mono/1.0
>+plat_bindir2 = $(libdir)/mono/2.0
>+plat_tooldir = $(libdir)/xsp/1.0
>+plat_tooldir2 = $(libdir)/xsp/2.0
> 
> REWRITE = sed \
> 	-e 's,@''plat_bindir@,$(plat_bindir),g'		\
>diff -ruN xsp-1.2.6.orig/src/Mono.WebServer/Makefile.am xsp-1.2.6/src/Mono.WebServer/Makefile.am
>--- xsp-1.2.6.orig/src/Mono.WebServer/Makefile.am	2007-08-16 13:31:23.000000000 -0700
>+++ xsp-1.2.6/src/Mono.WebServer/Makefile.am	2008-01-24 16:09:21.000000000 -0800
>@@ -2,8 +2,8 @@
> builddir=$(top_builddir)/src/Mono.WebServer
> MCSFLAGS= -debug+ -debug:full -nologo -unsafe -nowarn:618 $(WEBTRACING) -doc:$(top_builddir)/docs/Mono.WebServer.xml
> 
>-monowebserverdir = $(prefix)/lib/xsp/1.0
>-monowebserver2dir = $(prefix)/lib/xsp/2.0
>+monowebserverdir = $(libdir)/xsp/1.0
>+monowebserver2dir = $(libdir)/xsp/2.0
> 
> pkgconfig_DATA = xsp.pc xsp-2.pc
> noinst_SCRIPTS= Mono.WebServer.dll $(monowebserver2_install)
>diff -ruN xsp-1.2.6.orig/src/Mono.WebServer.Apache/Makefile.am xsp-1.2.6/src/Mono.WebServer.Apache/Makefile.am
>--- xsp-1.2.6.orig/src/Mono.WebServer.Apache/Makefile.am	2007-11-08 15:00:41.000000000 -0800
>+++ xsp-1.2.6/src/Mono.WebServer.Apache/Makefile.am	2008-01-24 16:09:50.000000000 -0800
>@@ -14,9 +14,9 @@
> CLEANFILES = *.exe *.mdb
> 
> if PLATFORM_WIN32
>-references= -lib:"$(prefix)/lib" -r:../Mono.WebServer/Mono.WebServer.dll \
>+references= -lib:"$(libdir)" -r:../Mono.WebServer/Mono.WebServer.dll \
> 		-r:System.Web.dll -r:Mono.Posix.dll -r:Mono.Security.dll 
>-references2= -lib:"$(prefix)/lib" -r:../Mono.WebServer/Mono.WebServer2.dll \
>+references2= -lib:"$(libdir)" -r:../Mono.WebServer/Mono.WebServer2.dll \
> 			-r:System.Web.dll -r:Mono.Posix.dll -r:Mono.Security.dll 
> else
> references= -r:System.Web.dll -r:../Mono.WebServer/Mono.WebServer.dll -r:Mono.Posix.dll -r:Mono.Security.dll 
>diff -ruN xsp-1.2.6.orig/tools/asp_state/Makefile.am xsp-1.2.6/tools/asp_state/Makefile.am
>--- xsp-1.2.6.orig/tools/asp_state/Makefile.am	2007-07-24 15:56:21.000000000 -0700
>+++ xsp-1.2.6/tools/asp_state/Makefile.am	2008-01-24 16:12:09.000000000 -0800
>@@ -1,6 +1,6 @@
> MCSFLAGS= -debug+ -debug:full -nologo
> 
>-aspstatedir = $(prefix)/lib/xsp/1.0
>+aspstatedir = $(libdir)/xsp/1.0
> aspstate_SCRIPTS = asp-state.exe
> aspstate_DATA = asp-state.exe.config
> 
>@@ -8,7 +8,7 @@
> scripts2 = asp-state2.exe
> data2 = asp-state2.exe.config
> endif
>-aspstate2dir = $(prefix)/lib/xsp/2.0
>+aspstate2dir = $(libdir)/xsp/2.0
> aspstate2_SCRIPTS = $(scripts2)
> aspstate2_DATA = $(data2)
> 
>iff -ruN xsp-1.2.6.orig/tools/dbsessmgr/Makefile.am xsp-1.2.6/tools/dbsessmgr/Makefile.am
>--- xsp-1.2.6.orig/tools/dbsessmgr/Makefile.am	2007-07-24 15:56:21.000000000 -0700
>+++ xsp-1.2.6/tools/dbsessmgr/Makefile.am	2008-01-24 16:12:30.000000000 -0800
>@@ -1,6 +1,6 @@
> MCSFLAGS= -debug+ -debug:full -nologo
> 
>-dbsessmgrdir = $(prefix)/lib/xsp/1.0
>+dbsessmgrdir = $(libdir)/xsp/1.0
> dbsessmgr_SCRIPTS = dbsessmgr.exe
> dbsessmgr_DATA = dbsessmgr.exe.config
> 
>@@ -8,7 +8,7 @@
> scripts2 = dbsessmgr2.exe
> data2 = dbsessmgr2.exe.config
> endif
>-dbsessmgr2dir = $(prefix)/lib/xsp/2.0
>+dbsessmgr2dir = $(libdir)/xsp/2.0
> dbsessmgr2_SCRIPTS = $(scripts2)
> dbsessmgr2_DATA = $(data2)
>

Actions: View | Diff

Attachments on bug 430173: 292905 | 292906 | 293867 | 295408