[Momonga-devel.ja:03286] Re: mono patch for x86_64
- From: Masanobu Sato <m.sato@xxxxxxxxxxxx>
- Date: Tue, 31 Jan 2006 07:40:29 +0900
佐藤＠滋賀県です
mono関係のパッチ修正しました。
monodoc,xspもライブラリのインストール
ディレクトリが違う問題があるので、パッチ
作りました。mono-tool,gtk-sharpも同じ問
題があると思いますが、そこまで手が回っ
てません。
--
Masanobu Sato
m.sato@xxxxxxxxxxxx
diff -uNr mono-1.1.13.2/configure mono-1.1.13.2.new/configure
--- mono-1.1.13.2/configure 2006-01-20 12:04:53.000000000 +0900
+++ mono-1.1.13.2.new/configure 2006-01-29 17:53:23.000000000 +0900
@@ -38417,7 +38417,7 @@
if test x$cross_compiling = xno; then
echo "prefix=$prefix" > $srcdir/$mcsdir/build/config.make
echo "exec_prefix=$exec_prefix" >> $srcdir/$mcsdir/build/config.make
- echo 'mono_libdir=${exec_prefix}/lib' >> $srcdir/$mcsdir/build/config.make
+ echo "mono_libdir=$libdir" >> $srcdir/$mcsdir/build/config.make
echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$mcsdir/build/config.make
echo 'IL_FLAGS = /debug' >> $srcdir/$mcsdir/build/config.make
echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$mcsdir/build/config.make
diff -uNr mono-1.1.13.2/configure.in mono-1.1.13.2.new/configure.in
--- mono-1.1.13.2/configure.in 2006-01-20 11:00:02.000000000 +0900
+++ mono-1.1.13.2.new/configure.in 2006-01-29 17:52:50.000000000 +0900
@@ -1857,7 +1857,7 @@
if test x$cross_compiling = xno; then
echo "prefix=$prefix" > $srcdir/$mcsdir/build/config.make
echo "exec_prefix=$exec_prefix" >> $srcdir/$mcsdir/build/config.make
- echo 'mono_libdir=${exec_prefix}/lib' >> $srcdir/$mcsdir/build/config.make
+ echo "mono_libdir=$libdir" >> $srcdir/$mcsdir/build/config.make
echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$mcsdir/build/config.make
echo 'IL_FLAGS = /debug' >> $srcdir/$mcsdir/build/config.make
echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$mcsdir/build/config.make
--- mono-1.1.13.2/mono/metadata/Makefile.am 2005-11-10 11:24:50.000000000 +0900
+++ mono-1.1.13.2.new/mono/metadata/Makefile.am 2006-01-31 00:43:29.000000000 +0900
@@ -9,7 +9,7 @@
# The mingw math.h has "extern inline" functions that dont appear in libs, so
# optimisation is required to actually inline them
AM_CFLAGS = -O
-assembliesdir = $(exec_prefix)/lib
+assembliesdir = $(libdir)
confdir = $(sysconfdir)
endif
diff -uNr mono-1.1.13.2/mono/os/unix/Makefile.am mono-1.1.13.2.new/mono/os/unix/Makefile.am
--- mono-1.1.13.2/mono/os/unix/Makefile.am 2005-11-10 04:09:19.000000000 +0900
+++ mono-1.1.13.2.new/mono/os/unix/Makefile.am 2006-01-31 00:43:29.000000000 +0900
@@ -5,7 +5,7 @@
assembliesdir = `cygpath -m "${libdir}"`
confdir = `cygpath -m "${sysconfdir}"`
else
-assembliesdir = $(exec_prefix)/lib
+assembliesdir = $(libdir)
confdir = $(sysconfdir)
endif
diff -uNr mono-1.1.13.2/scripts/Makefile.am mono-1.1.13.2.new/scripts/Makefile.am
--- mono-1.1.13.2/scripts/Makefile.am 2005-11-21 18:04:17.000000000 +0900
+++ mono-1.1.13.2.new/scripts/Makefile.am 2006-01-31 00:43:29.000000000 +0900
@@ -70,7 +70,7 @@
mono_instdir = $(shell cygpath -m $(libdir))/mono
else
plat_bindir = $(bindir)
-mono_instdir = $(prefix)/lib/mono
+mono_instdir = $(libdir)/mono
endif
REWRITE = sed \
diff -uNr monodoc-1.1.13/class/Makefile.am monodoc-1.1.13.new/class/Makefile.am
--- monodoc-1.1.13/class/Makefile.am 2005-09-27 20:31:22.000000000 +0900
+++ monodoc-1.1.13.new/class/Makefile.am 2006-01-31 07:00:53.000000000 +0900
@@ -85,14 +85,14 @@
update:
for i in $(UPDATE_DIRS); do \
- mono --debug ../generator/updater.exe @prefix@/lib/$$i.dll -o ./$$i/en || exit 1; \
+ mono --debug ../generator/updater.exe @libdir@/$$i.dll -o ./$$i/en || exit 1; \
done
- mono --debug ../generator/updater.exe @prefix@/lib/mscorlib.dll -o ./corlib/en -f
- mono --debug ../generator/updater.exe @prefix@/lib/System.Xml.dll -o ./System.XML/en -f
+ mono --debug ../generator/updater.exe @libdir@/mscorlib.dll -o ./corlib/en -f
+ mono --debug ../generator/updater.exe @libdir@/System.Xml.dll -o ./System.XML/en -f
mono --debug ../generator/updater.exe /usr/local/lib/System.Security.dll -o ./System.Security/en -f
mono --debug ../generator/updater.exe /usr/local/lib/Mono.Security.dll -o ./Mono.Security/en -f
mono --debug ../generator/updater.exe /usr/local/lib/Mono.Security.Win32.dll -o ./Mono.Security.Win32/en -f
- mono --debug ../generator/updater.exe @prefix@/lib/NUnit.Framework.dll -o ./nunit/en -f
+ mono --debug ../generator/updater.exe @libdir@/NUnit.Framework.dll -o ./nunit/en -f
dist-hook:
find . -name '*.xml' > files
diff -uNr monodoc-1.1.13/class/Makefile.am~ monodoc-1.1.13.new/class/Makefile.am~
--- monodoc-1.1.13/class/Makefile.am~ 1970-01-01 09:00:00.000000000 +0900
+++ monodoc-1.1.13.new/class/Makefile.am~ 2005-09-27 20:31:22.000000000 +0900
@@ -0,0 +1,100 @@
+sourcesdir = $(libdir)/monodoc/sources
+
+if BUILD_CSERRORS
+sources_DATA = \
+ ecma334.tree ecma334.zip ecma334.source \
+ netdocs.tree netdocs.zip netdocs.source \
+ nunit-docs.tree nunit-docs.zip nunit-docs.source \
+ cs-errors.tree cs-errors.zip cs-errors.source \
+ Mono.tree Mono.zip Mono.source \
+ Novell.source Novell.zip Novell.tree
+else
+sources_DATA = \
+ ecma334.tree ecma334.zip ecma334.source \
+ netdocs.tree netdocs.zip netdocs.source \
+ nunit-docs.tree nunit-docs.zip nunit-docs.source \
+ Mono.tree Mono.zip Mono.source \
+ Novell.source Novell.zip Novell.tree
+endif
+
+ASSEMBLER = ../engine/assembler.exe
+
+#
+# Netdocs contains all the .NET Framework documentation
+#
+netdocs: netdocs.tree
+
+netdocs.tree netdocs.zip: $(srcdir)/*/en/*/*.xml $(srcdir)/*/en/*.xml
+ mono --debug $(ASSEMBLER) --ecma $(srcdir)/corlib/en/ --ecma $(srcdir)/System/en/ --ecma $(srcdir)/System.XML/en/ --ecma $(srcdir)/System.Web/en --ecma $(srcdir)/System.Web.Services/en --ecma $(srcdir)/System.Data/en --ecma $(srcdir)/System.DirectoryServices/en --ecma $(srcdir)/System.Drawing/en --ecma $(srcdir)/System.Security/en -o netdocs
+
+#
+# All the Mono.* namespaces go into a single package
+#
+Mono.tree Mono.zip: $(srcdir)/Mono.Cairo/en/*/*.xml $(srcdir)/Mono.GetOptions/en/*/*.xml $(srcdir)/Mono.Posix/en/*/*.xml $(srcdir)/Mono.Security/en/*/*.xml $(srcdir)/Mono.Security.Win32/en/*/*.xml $(srcdir)/Commons.Xml.Relaxng/en/*/*.xml
+ mono --debug $(ASSEMBLER) --ecma $(srcdir)/Mono.Cairo/en --ecma $(srcdir)/Mono.GetOptions/en --ecma $(srcdir)/Mono.Posix/en --ecma $(srcdir)/Mono.Security.Win32/en/ --ecma $(srcdir)/Mono.Security/en/ --ecma $(srcdir)/Commons.Xml.Relaxng/en/ -o Mono
+
+#
+# All the Novell namespaces we handle go into a single file (one for now).
+#
+Novell.tree Novell.zip: $(srcdir)/Novell.Directory.Ldap/en/*/*.xml
+ mono --debug $(ASSEMBLER) --ecma $(srcdir)/Novell.Directory.Ldap/en/ -o Novell
+
+#
+# These are the NUnit documents, not sure why we have these, if NUnit is well documented
+#
+nunit-docs.tree nunit-docs.zip: $(srcdir)/nunit/en/*/*.xml $(srcdir)/nunit/en/*.xml
+ mono --debug $(ASSEMBLER) --ecma $(srcdir)/nunit/en/ -o nunit-docs
+
+#
+# Generation of C# errors, from the mcs source tree
+#
+cs-errors.tree cs-errors.zip: $(srcdir)/cs-errors.config
+ mono --debug $(ASSEMBLER) --error $(srcdir)/cs-errors.config -o cs-errors
+
+#
+# The ECMA C# specification, from Jon Jagger.
+#
+ecma334.tree ecma334.zip: $(srcdir)/../ecma334/*
+ mono --debug $(ASSEMBLER) --ecmaspec $(srcdir)/../ecma334 -o ecma334
+
+CLEANFILES = \
+ ecma334.tree ecma334.zip \
+ netdocs.tree netdocs.zip \
+ nunit-docs.tree nunit-docs.zip \
+ cs-errors.tree cs-errors.zip \
+ Mono.tree Mono.zip \
+ Novell.tree Novell.zip \
+ tmp
+
+EXTRA_DIST = \
+ $(sources_DATA)
+
+dirs = \
+ corlib System System.Configuration.Install System.Data System.Design \
+ System.Drawing System.Runtime.Remoting \
+ System.Runtime.Serialization.Formatters.Soap System.Web \
+ System.Web.Services System.Windows.Forms System.XML \
+ nunit Mono.Cairo Mono.GetOptions Mono.Posix Mono.Security Mono.Security.Win32
+
+UPDATE_DIRS = \
+ System System.Configuration.Install System.Data System.Design \
+ System.Drawing System.Runtime.Remoting \
+ System.Runtime.Serialization.Formatters.Soap System.Web \
+ System.Web.Services System.Windows.Forms Npgsql \
+ Mono.Cairo Mono.GetOptions Mono.Posix Mono.Security Mono.Security.Win32
+
+update:
+ for i in $(UPDATE_DIRS); do \
+ mono --debug ../generator/updater.exe @prefix@/lib/$$i.dll -o ./$$i/en || exit 1; \
+ done
+ mono --debug ../generator/updater.exe @prefix@/lib/mscorlib.dll -o ./corlib/en -f
+ mono --debug ../generator/updater.exe @prefix@/lib/System.Xml.dll -o ./System.XML/en -f
+ mono --debug ../generator/updater.exe /usr/local/lib/System.Security.dll -o ./System.Security/en -f
+ mono --debug ../generator/updater.exe /usr/local/lib/Mono.Security.dll -o ./Mono.Security/en -f
+ mono --debug ../generator/updater.exe /usr/local/lib/Mono.Security.Win32.dll -o ./Mono.Security.Win32/en -f
+ mono --debug ../generator/updater.exe @prefix@/lib/NUnit.Framework.dll -o ./nunit/en -f
+
+dist-hook:
+ find . -name '*.xml' > files
+ tar cTf files - | (cd $(distdir); tar xf -)
+ cp $(srcdir)/cs-errors.* $(distdir)
diff -uNr monodoc-1.1.13/engine/Makefile.am monodoc-1.1.13.new/engine/Makefile.am
--- monodoc-1.1.13/engine/Makefile.am 2005-12-14 06:39:19.000000000 +0900
+++ monodoc-1.1.13.new/engine/Makefile.am 2006-01-31 07:01:57.000000000 +0900
@@ -4,11 +4,11 @@
DISTCLEANFILE = AssemblyInfo.cs
if USE_CYGPATH
-GACDIR=`cygpath -w $(prefix)/lib`
-GACROOT=`cygpath -w $(DESTDIR)$(prefix)/lib`
+GACDIR=`cygpath -w $(libdir)`
+GACROOT=`cygpath -w $(DESTDIR)$(libdir)`
else
-GACDIR=$(prefix)/lib
-GACROOT=$(DESTDIR)$(prefix)/lib
+GACDIR=$(libdir)
+GACROOT=$(DESTDIR)$(libdir)
endif
monodoc_sources = \
diff -uNr monodoc-1.1.13/engine/Makefile.am~ monodoc-1.1.13.new/engine/Makefile.am~
--- monodoc-1.1.13/engine/Makefile.am~ 1970-01-01 09:00:00.000000000 +0900
+++ monodoc-1.1.13.new/engine/Makefile.am~ 2005-12-14 06:39:19.000000000 +0900
@@ -0,0 +1,142 @@
+monodoc_DATA = assembler.exe normalize.exe monodoc.xml mod.exe validate.exe cs2ecma.exe
+noinst_DATA = monodoc.dll monodoc.dll.config
+CLEANFILES = monodoc.dll assembler.exe $(monodoc_unix_DATA) normalize.exe mod.exe validate.exe cs2ecma.exe
+DISTCLEANFILE = AssemblyInfo.cs
+
+if USE_CYGPATH
+GACDIR=`cygpath -w $(prefix)/lib`
+GACROOT=`cygpath -w $(DESTDIR)$(prefix)/lib`
+else
+GACDIR=$(prefix)/lib
+GACROOT=$(DESTDIR)$(prefix)/lib
+endif
+
+monodoc_sources = \
+ $(srcdir)/colorizer.cs \
+ $(srcdir)/man-provider.cs \
+ $(srcdir)/monohb-provider.cs \
+ $(srcdir)/xhtml-provider.cs \
+ $(srcdir)/ecma-provider.cs \
+ $(srcdir)/simple-provider.cs \
+ $(srcdir)/html-helper.cs \
+ $(srcdir)/provider.cs \
+ $(srcdir)/index.cs \
+ $(srcdir)/error-provider.cs \
+ $(srcdir)/ecmaspec-provider.cs \
+ $(srcdir)/editing.cs \
+ $(srcdir)/settings.cs \
+ $(srcdir)/commentservice.cs \
+ $(srcdir)/XmlNodeWriter.cs \
+ $(srcdir)/SearchableIndex.cs \
+ $(srcdir)/SearchableDocument.cs \
+ AssemblyInfo.cs
+
+lucene_sources = \
+ $(srcdir)/Lucene.Net.dll.sources
+
+assembler_sources = \
+ $(srcdir)/assembler.cs
+
+dump_sources = \
+ $(srcdir)/dump.cs
+
+validate_sources = \
+ $(srcdir)/validate.cs
+
+cs2ecma_sources = \
+ $(srcdir)/cs2ecma.cs
+
+EXTRA_DIST = \
+ $(monodoc_sources) $(assembler_sources) \
+ $(dump_sources) \
+ $(lucene_sources) \
+ $(validate_sources) monodoc-ecma.xsd \
+ monodoc.xml mono-ecma.xsl \
+ normalize.cs monodoc.dll.config.in \
+ ecmaspec-html.xsl mod.cs \
+ AssemblyInfo.cs.in $(cs2ecma_sources) \
+ ecmaspec-html-css.xsl ecmaspec.css \
+ base.css mono-ecma-css.xsl mono-ecma.css \
+ home.html
+
+monodoc_FILES = assembler.exe normalize.exe validate.exe cs2ecma.exe
+
+assembler.exe: $(assembler_sources) monodoc.dll
+ $(CSC) /debug /out:assembler.exe $(assembler_sources) -r:ICSharpCode.SharpZipLib.dll -r:./monodoc.dll
+
+dump.exe: $(dump_sources) monodoc.dll
+ $(CSC) -debug -out:dump.exe $(dump_sources) -r:ICSharpCode.SharpZipLib.dll -r:./monodoc.dll
+
+normalize.exe: normalize.cs
+ $(CSC) $(srcdir)/normalize.cs -out:normalize.exe
+
+validate.exe: validate.cs $(srcdir)/monodoc-ecma.xsd
+ $(CSC) $(srcdir)/validate.cs -out:validate.exe /resource:$(srcdir)/monodoc-ecma.xsd,monodoc-ecma.xsd
+
+cs2ecma.exe: cs2ecma.cs
+ $(CSC) $(srcdir)/cs2ecma.cs -out:cs2ecma.exe
+
+mono.pub: $(top_srcdir)/mono.pub
+ cp $(top_srcdir)/mono.pub .
+
+monodoc.dll: lucene_sources $(monodoc_sources) mono-ecma.xsl mono.pub ecmaspec-html-css.xsl ecmaspec.css base.css mono-ecma-css.xsl mono-ecma.css home.html
+ $(CSC) -debug -out:monodoc.dll -target:library /resource:$(srcdir)/mono-ecma.xsl,mono-ecma.xsl /resource:$(srcdir)/ecmaspec-html.xsl,ecmaspec-html.xsl /resource:$(srcdir)/ecmaspec-html-css.xsl,ecmaspec-html-css.xsl /resource:$(srcdir)/base.css,base.css /resource:$(srcdir)/ecmaspec.css,ecmaspec.css /resource:$(srcdir)/mono-ecma-css.xsl,mono-ecma-css.xsl /resource:$(srcdir)/mono-ecma.css,mono-ecma.css /resource:$(srcdir)/home.html,home.html $(monodoc_sources) @lucene_sources -r:ICSharpCode.SharpZipLib.dll -r:System.Web -r:System.Web.Services
+
+lucene_sources: $(srcdir)/Lucene.Net.dll.sources
+ sed "s,\@srcdir\@,$(srcdir)," < $(srcdir)/Lucene.Net.dll.sources > lucene_sources
+
+monodoc.dll.config: $(srcdir)/monodoc.dll.config.in Makefile
+ if sed 's,@''monodoc_refdir@,$(monodoc_refdir),' $(srcdir)/monodoc.dll.config.in > $@t; then mv $@t $@; else rm -f $@t ; exit 1; fi
+
+mod.exe: mod.cs monodoc.dll
+ $(CSC) $(srcdir)/mod.cs -r:./monodoc.dll -out:mod.exe
+
+dist-hook: assembler.exe
+ mkdir $(distdir)/web
+ mkdir $(distdir)/web/images
+ mkdir $(distdir)/web/xtree
+ mkdir $(distdir)/web/xtree/images
+ mkdir $(distdir)/web/xtree/images/msdn
+ mkdir $(distdir)/web/xtree/images/msdn2
+ mkdir $(distdir)/web/xtree/images/xp
+ mkdir $(distdir)/web/ptree
+ cp $(srcdir)/web/index.aspx $(srcdir)/web/monodoc.ashx $(distdir)/web
+ cp $(srcdir)/web/searching.gif $(distdir)/web
+ cp $(srcdir)/web/header.aspx $(distdir)/web
+ cp $(srcdir)/web/web.config $(distdir)/web
+ cp $(srcdir)/web/common.css $(distdir)/web
+ cp $(srcdir)/web/sidebar.css $(distdir)/web
+ cp $(srcdir)/web/sidebar.js $(distdir)/web
+ cp $(srcdir)/web/images/*png $(distdir)/web/images
+ cp $(srcdir)/web/xtree/images/msdn/*gif $(distdir)/web/xtree/images/msdn
+ cp $(srcdir)/web/xtree/images/msdn2/*gif $(distdir)/web/xtree/images/msdn2
+ cp $(srcdir)/web/xtree/images/xp/*png $(distdir)/web/xtree/images/xp
+ cp $(srcdir)/web/xtree/images/*png $(distdir)/web/xtree/images
+ cp $(srcdir)/web/xtree/*js $(distdir)/web/xtree
+ cp $(srcdir)/web/xtree/*css $(distdir)/web/xtree
+ cp $(srcdir)/web/ptree/*css $(distdir)/web/ptree
+ cp $(srcdir)/web/ptree/*js $(distdir)/web/ptree
+ cp -a $(srcdir)/Lucene.Net $(distdir)
+
+
+bin/Monodoc.Contributions.dll: server.cs
+ -mkdir bin
+ mcs -g server.cs -target:library -out:bin/Monodoc.Contributions.dll -r:System.Web -r:System.Web.Services -r:./monodoc.dll -r:System.Data -r:ByteFX.Data
+
+web: bin/Monodoc.Contributions.dll
+ mono --debug /mono/bin/xsp.exe
+
+db:
+ mysql -u admin -p
+
+cleandb:
+ mysql -u admin -p < tables.sql
+
+up:
+ scp tables.sql server.cs server.asmx monodoc.dll root@xxxxxxxxxxxxxxx:
+
+install-data-local:
+ $(GACUTIL) /i monodoc.dll /f /package monodoc /gacdir $(GACDIR) /root $(GACROOT)
+
+uninstall-local:
+ -$(GACUTIL) /u monodoc /package monodoc /gacdir $(GACDIR) /root $(GACROOT)
diff -uNr xsp-1.1.13/scripts/Makefile.in xsp-1.1.13.new/scripts/Makefile.in
--- xsp-1.1.13/scripts/Makefile.in 2006-01-07 04:37:14.000000000 +0900
+++ xsp-1.1.13.new/scripts/Makefile.in 2006-01-31 06:47:35.000000000 +0900
@@ -137,8 +137,8 @@
bin1_scripts = xsp mod-mono-server asp-state dbsessmgr
bin_SCRIPTS = $(bin1_scripts) $(bin2_scripts)
CLEANFILES = $(bin1_scripts) $(bin2_scripts_real)
-plat_bindir = $(prefix)/lib/xsp/1.0
-plat_bindir2 = $(prefix)/lib/xsp/2.0
+plat_bindir = $(libdir)/xsp/1.0
+plat_bindir2 = $(libdir)/xsp/2.0
REWRITE = sed \
-e 's,@''plat_bindir@,$(plat_bindir),g' \
-e 's,@''exe_file@,$@.exe,g' \
diff -uNr xsp-1.1.13/src/Makefile.in xsp-1.1.13.new/src/Makefile.in
--- xsp-1.1.13/src/Makefile.in 2006-01-07 04:37:14.000000000 +0900
+++ xsp-1.1.13.new/src/Makefile.in 2006-01-31 06:45:19.000000000 +0900
@@ -150,10 +150,10 @@
target_vendor = @target_vendor@
SUBDIRS = Mono.WebServer
MCSFLAGS = -debug+ -debug:full -nologo -nowarn:618
-xspdir = $(prefix)/lib/xsp/1.0
-modmonoserverdir = $(prefix)/lib/xsp/1.0
-xsp2dir = $(prefix)/lib/xsp/2.0
-modmonoserver2dir = $(prefix)/lib/xsp/2.0
+xspdir = $(libdir)/xsp/1.0
+modmonoserverdir = $(libdir)/xsp/1.0
+xsp2dir = $(libdir)/xsp/2.0
+modmonoserver2dir = $(libdir)/xsp/2.0
@NET_2_0_TRUE@XSP2_EXE = xsp2.exe
@NET_2_0_TRUE@MODMONOSERVER2_EXE = mod-mono-server2.exe
xsp_SCRIPTS = xsp.exe
diff -uNr xsp-1.1.13/src/Mono.WebServer/Makefile.in xsp-1.1.13.new/src/Mono.WebServer/Makefile.in
--- xsp-1.1.13/src/Mono.WebServer/Makefile.in 2006-01-07 04:37:14.000000000 +0900
+++ xsp-1.1.13.new/src/Mono.WebServer/Makefile.in 2006-01-31 06:44:26.000000000 +0900
@@ -147,8 +147,8 @@
target_vendor = @target_vendor@
pkgconfigdir = $(libdir)/pkgconfig
MCSFLAGS = -debug+ -debug:full -nologo -unsafe -nowarn:618
-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
monowebserver_SCRIPTS = Mono.WebServer.dll
monowebserver2_SCRIPTS = $(monowebserver2_install)
diff -uNr xsp-1.1.13/tools/asp_state/Makefile.in xsp-1.1.13.new/tools/asp_state/Makefile.in
--- xsp-1.1.13/tools/asp_state/Makefile.in 2006-01-07 04:37:17.000000000 +0900
+++ xsp-1.1.13.new/tools/asp_state/Makefile.in 2006-01-31 06:46:54.000000000 +0900
@@ -135,10 +135,10 @@
target_os = @target_os@
target_vendor = @target_vendor@
MCSFLAGS = -debug+ -debug:full -nologo
-aspstatedir = $(prefix)/lib/xsp/1.0
+aspstatedir = $(libdir)/xsp/1.0
aspstate_SCRIPTS = asp-state.exe asp-state.exe.config
@NET_2_0_TRUE@scripts2 = asp-state2.exe asp-state2.exe.config
-aspstate2dir = $(prefix)/lib/xsp/2.0
+aspstate2dir = $(libdir)/xsp/2.0
aspstate2_SCRIPTS = $(scripts2)
EXTRA_DIST = $(aspstate_input) asp-state.exe.config asp-state2.exe.config
CLEANFILES = *.exe *.mdb
diff -uNr xsp-1.1.13/tools/dbsessmgr/Makefile.in xsp-1.1.13.new/tools/dbsessmgr/Makefile.in
--- xsp-1.1.13/tools/dbsessmgr/Makefile.in 2006-01-07 04:37:17.000000000 +0900
+++ xsp-1.1.13.new/tools/dbsessmgr/Makefile.in 2006-01-31 06:46:10.000000000 +0900
@@ -135,10 +135,10 @@
target_os = @target_os@
target_vendor = @target_vendor@
MCSFLAGS = -debug+ -debug:full -nologo
-dbsessmgrdir = $(prefix)/lib/xsp/1.0
+dbsessmgrdir = $(libdir)/xsp/1.0
dbsessmgr_SCRIPTS = dbsessmgr.exe dbsessmgr.exe.config
@NET_2_0_TRUE@scripts2 = dbsessmgr2.exe dbsessmgr2.exe.config
-dbsessmgr2dir = $(prefix)/lib/xsp/2.0
+dbsessmgr2dir = $(libdir)/xsp/2.0
dbsessmgr2_SCRIPTS = $(scripts2)
EXTRA_DIST = $(dbsessmgr_input) dbsessmgr.exe.config dbsessmgr2.exe.config
CLEANFILES = *.exe *.mdb