devel/mono/mono-26-libdir.patch

--- mono-1.2.6/mcs/build/config-default.make	2007-11-08 22:08:59.000000000 +0000
+++ mono-1.2.6/mcs/build/config-default-new.make	2007-12-14 22:25:20.000000000 +0000
@@ -17,7 +17,7 @@
 CFLAGS = -g -O2
 prefix = /usr/local
 exec_prefix = $(prefix)
-mono_libdir = $(exec_prefix)/lib
+mono_libdir = $(libdir)
 sysconfdir = $(prefix)/etc
 #RUNTIME = mono
 RUNTIME = false
--- mono-1.2.6/configure.in	2007-11-08 22:07:57.000000000 +0000
+++ mono-1.2.6/configure-new.in	2007-12-14 22:56:17.000000000 +0000
@@ -2182,7 +2182,7 @@
     echo "prefix=$prefix" > $srcdir/$mcsdir/build/config.make
     echo "exec_prefix=$exec_prefix" >> $srcdir/$mcsdir/build/config.make
     echo "sysconfdir=$sysconfdir" >> $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
@@ -2215,7 +2215,7 @@
     if test x$cross_compiling = xno && test x$enable_olive_build != xno; then
       echo "prefix=$prefix" > $srcdir/$olivedir/build/config.make
       echo "exec_prefix=$exec_prefix" >> $srcdir/$olivedir/build/config.make
-      echo 'mono_libdir=${exec_prefix}/lib' >> $srcdir/$olivedir/build/config.make
+      echo 'mono_libdir=@libdir@' >> $srcdir/$olivedir/build/config.make
       echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$olivedir/build/config.make
       echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$olivedir/build/config.make
       echo "MONO_VERSION = $myver" >> $srcdir/$olivedir/build/config.make
--- mono-2.2/data/cecil.pc.in	2008-11-18 21:10:32.000000000 +0000
+++ mono-2.2/data/cecil.pc-new.in	2008-11-18 21:12:20.000000000 +0000
@@ -1,4 +1,4 @@
-assemblies_dir=@prefix@/lib/mono
+assemblies_dir=@libdir@/mono
 Libraries=${assemblies_dir}/gac/Mono.Cecil/0.6.9.0__0738eb9f132ed756/Mono.Cecil.dll
 
 Name: Mono Internal -- Do not use.
--- mono-2.2/data/mint.pc.in	2008-11-18 21:10:32.000000000 +0000
+++ mono-2.2/data/mint.pc-new.in	2008-11-18 21:12:55.000000000 +0000
@@ -1,5 +1,5 @@
 prefix=${pcfiledir}/../..
 exec_prefix=${pcfiledir}/../..
-libdir=${prefix}/lib
+libdir=@libdir@
 includedir=${prefix}/include/mono-@API_VER@
 
--- mono-2.2/data/mono-lineeditor.pc.in	2008-11-11 04:56:15.000000000 +0000
+++ mono-2.2/data/mono-lineeditor.pc-new.in	2008-11-18 21:14:18.000000000 +0000
@@ -1,5 +1,5 @@
 prefix=${pcfiledir}/../..
-assemblies_dir=${prefix}/lib/mono-source-libs
+assemblies_dir=@libdir@/mono-source-libs
 Sources=${assemblies_dir}/getline.cs
 
 Name: Mono.Terminal.LineEditor
--- mono-2.2/data/mono-nunit.pc.in	2008-11-11 04:56:15.000000000 +0000
+++ mono-2.2/data/mono-nunit.pc-new.in	2008-11-18 21:14:34.000000000 +0000
@@ -1,6 +1,6 @@
 prefix=${pcfiledir}/../..
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@libdir@
 
 
 Name: Mono NUnit
--- mono-2.2/data/mono-options.pc.in	2008-11-11 04:56:15.000000000 +0000
+++ mono-2.2/data/mono-options.pc-new.in	2008-11-18 21:14:49.000000000 +0000
@@ -1,5 +1,5 @@
 prefix=${pcfiledir}/../..
-assemblies_dir=${prefix}/lib/mono-source-libs
+assemblies_dir=@libdir@/mono-source-libs
 Sources=${assemblies_dir}/Options.cs
 
 Name: Mono.Options
--- mono-2.2/data/monodoc.pc.in	2008-11-13 23:22:27.000000000 +0000
+++ mono-2.2/data/monodoc.pc-new.in	2008-11-26 12:39:50.000000000 +0000
@@ -1,9 +1,9 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-libdir=@prefix@/lib
+libdir=@libdir@
 sourcesdir=${libdir}/monodoc/sources
 
 Name: Monodoc
 Description: Monodoc - Mono Documentation Tools
 Version: @VERSION@
-Libs: /r:${prefix}/lib/mono/monodoc/monodoc.dll 
+Libs: /r:${libdir}/mono/monodoc/monodoc.dll 
--- mono-2.2/data/mono.pc.in	2008-09-10 17:12:13.000000000 +0100
+++ mono-2.2/data/mono.pc-new.in	2008-11-26 12:47:07.000000000 +0000
@@ -1,6 +1,6 @@
 prefix=${pcfiledir}/../..
 exec_prefix=${pcfiledir}/../..
-libdir=${prefix}/@reloc_libdir@
+libdir=@libdir@
 includedir=${prefix}/include/mono-@API_VER@
 sysconfdir=@sysconfdir@

--- mono-2.2/scripts/Makefile.am	2008-11-18 19:19:30.000000000 +0000
+++ mono-2.2/scripts/Makefile-new.am	2008-11-18 21:00:50.000000000 +0000
@@ -174,7 +174,7 @@
 endif
 else
 plat_bindir = $(bindir)
-mono_instdir = $(prefix)/lib/mono
+mono_instdir = $(libdir)/mono
 endif

 
--- mono-2.4/data/mono-cairo.pc.in	2009-02-13 23:34:32.000000000 +0000
+++ mono-2.4/data/mono-cairo.pc-new.in	2009-03-07 23:32:13.000000000 +0000
@@ -1,9 +1,9 @@
 prefix=${pcfiledir}/../..
 exec_prefix=${pcfiledir}/../..
-libdir=${prefix}/@reloc_libdir@
+libdir=@libdir@
 includedir=${prefix}/include
 
 Name: Mono.Cairo
 Description: Cairo bindings for Mono
 Version: @VERSION@
-Libs: -r:${prefix}/lib/mono/1.0/Mono.Cairo.dll
+Libs: -r:${libdir}/mono/1.0/Mono.Cairo.dll
1	--- mono-1.2.6/mcs/build/config-default.make 2007-11-08 22:08:59.000000000 +0000
2	+++ mono-1.2.6/mcs/build/config-default-new.make 2007-12-14 22:25:20.000000000 +0000
3	@@ -17,7 +17,7 @@
4	CFLAGS = -g -O2
5	prefix = /usr/local
6	exec_prefix = $(prefix)
7	-mono_libdir = $(exec_prefix)/lib
8	+mono_libdir = $(libdir)
9	sysconfdir = $(prefix)/etc
10	#RUNTIME = mono
11	RUNTIME = false
12	--- mono-1.2.6/configure.in 2007-11-08 22:07:57.000000000 +0000
13	+++ mono-1.2.6/configure-new.in 2007-12-14 22:56:17.000000000 +0000
14	@@ -2182,7 +2182,7 @@
15	echo "prefix=$prefix" > $srcdir/$mcsdir/build/config.make
16	echo "exec_prefix=$exec_prefix" >> $srcdir/$mcsdir/build/config.make
17	echo "sysconfdir=$sysconfdir" >> $srcdir/$mcsdir/build/config.make
18	- echo 'mono_libdir=${exec_prefix}/lib' >> $srcdir/$mcsdir/build/config.make
19	+ echo 'mono_libdir=@libdir@' >> $srcdir/$mcsdir/build/config.make
20	echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$mcsdir/build/config.make
21	echo 'IL_FLAGS = /debug' >> $srcdir/$mcsdir/build/config.make
22	echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$mcsdir/build/config.make
23	@@ -2215,7 +2215,7 @@
24	if test x$cross_compiling = xno && test x$enable_olive_build != xno; then
25	echo "prefix=$prefix" > $srcdir/$olivedir/build/config.make
26	echo "exec_prefix=$exec_prefix" >> $srcdir/$olivedir/build/config.make
27	- echo 'mono_libdir=${exec_prefix}/lib' >> $srcdir/$olivedir/build/config.make
28	+ echo 'mono_libdir=@libdir@' >> $srcdir/$olivedir/build/config.make
29	echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$olivedir/build/config.make
30	echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$olivedir/build/config.make
31	echo "MONO_VERSION = $myver" >> $srcdir/$olivedir/build/config.make
32	--- mono-2.2/data/cecil.pc.in 2008-11-18 21:10:32.000000000 +0000
33	+++ mono-2.2/data/cecil.pc-new.in 2008-11-18 21:12:20.000000000 +0000
34	@@ -1,4 +1,4 @@
35	-assemblies_dir=@prefix@/lib/mono
36	+assemblies_dir=@libdir@/mono
37	Libraries=${assemblies_dir}/gac/Mono.Cecil/0.6.9.0__0738eb9f132ed756/Mono.Cecil.dll
38
39	Name: Mono Internal -- Do not use.
40	--- mono-2.2/data/mint.pc.in 2008-11-18 21:10:32.000000000 +0000
41	+++ mono-2.2/data/mint.pc-new.in 2008-11-18 21:12:55.000000000 +0000
42	@@ -1,5 +1,5 @@
43	prefix=${pcfiledir}/../..
44	exec_prefix=${pcfiledir}/../..
45	-libdir=${prefix}/lib
46	+libdir=@libdir@
47	includedir=${prefix}/include/mono-@API_VER@
48
49	--- mono-2.2/data/mono-lineeditor.pc.in 2008-11-11 04:56:15.000000000 +0000
50	+++ mono-2.2/data/mono-lineeditor.pc-new.in 2008-11-18 21:14:18.000000000 +0000
51	@@ -1,5 +1,5 @@
52	prefix=${pcfiledir}/../..
53	-assemblies_dir=${prefix}/lib/mono-source-libs
54	+assemblies_dir=@libdir@/mono-source-libs
55	Sources=${assemblies_dir}/getline.cs
56
57	Name: Mono.Terminal.LineEditor
58	--- mono-2.2/data/mono-nunit.pc.in 2008-11-11 04:56:15.000000000 +0000
59	+++ mono-2.2/data/mono-nunit.pc-new.in 2008-11-18 21:14:34.000000000 +0000
60	@@ -1,6 +1,6 @@
61	prefix=${pcfiledir}/../..
62	exec_prefix=${prefix}
63	-libdir=${exec_prefix}/lib
64	+libdir=@libdir@
65
66
67	Name: Mono NUnit
68	--- mono-2.2/data/mono-options.pc.in 2008-11-11 04:56:15.000000000 +0000
69	+++ mono-2.2/data/mono-options.pc-new.in 2008-11-18 21:14:49.000000000 +0000
70	@@ -1,5 +1,5 @@
71	prefix=${pcfiledir}/../..
72	-assemblies_dir=${prefix}/lib/mono-source-libs
73	+assemblies_dir=@libdir@/mono-source-libs
74	Sources=${assemblies_dir}/Options.cs
75
76	Name: Mono.Options
77	--- mono-2.2/data/monodoc.pc.in 2008-11-13 23:22:27.000000000 +0000
78	+++ mono-2.2/data/monodoc.pc-new.in 2008-11-26 12:39:50.000000000 +0000
79	@@ -1,9 +1,9 @@
80	prefix=@prefix@
81	exec_prefix=@exec_prefix@
82	-libdir=@prefix@/lib
83	+libdir=@libdir@
84	sourcesdir=${libdir}/monodoc/sources
85
86	Name: Monodoc
87	Description: Monodoc - Mono Documentation Tools
88	Version: @VERSION@
89	-Libs: /r:${prefix}/lib/mono/monodoc/monodoc.dll
90	+Libs: /r:${libdir}/mono/monodoc/monodoc.dll
91	--- mono-2.2/data/mono.pc.in 2008-09-10 17:12:13.000000000 +0100
92	+++ mono-2.2/data/mono.pc-new.in 2008-11-26 12:47:07.000000000 +0000
93	@@ -1,6 +1,6 @@
94	prefix=${pcfiledir}/../..
95	exec_prefix=${pcfiledir}/../..
96	-libdir=${prefix}/@reloc_libdir@
97	+libdir=@libdir@
98	includedir=${prefix}/include/mono-@API_VER@
99	sysconfdir=@sysconfdir@
100
101	--- mono-2.2/scripts/Makefile.am 2008-11-18 19:19:30.000000000 +0000
102	+++ mono-2.2/scripts/Makefile-new.am 2008-11-18 21:00:50.000000000 +0000
103	@@ -174,7 +174,7 @@
104	endif
105	else
106	plat_bindir = $(bindir)
107	-mono_instdir = $(prefix)/lib/mono
108	+mono_instdir = $(libdir)/mono
109	endif
110
111
112	--- mono-2.4/data/mono-cairo.pc.in 2009-02-13 23:34:32.000000000 +0000
113	+++ mono-2.4/data/mono-cairo.pc-new.in 2009-03-07 23:32:13.000000000 +0000
114	@@ -1,9 +1,9 @@
115	prefix=${pcfiledir}/../..
116	exec_prefix=${pcfiledir}/../..
117	-libdir=${prefix}/@reloc_libdir@
118	+libdir=@libdir@
119	includedir=${prefix}/include
120
121	Name: Mono.Cairo
122	Description: Cairo bindings for Mono
123	Version: @VERSION@
124	-Libs: -r:${prefix}/lib/mono/1.0/Mono.Cairo.dll
125	+Libs: -r:${libdir}/mono/1.0/Mono.Cairo.dll
admin@fedoraproject.org	ViewVC Help
Powered by ViewVC 1.1.2