2005-03-26 Ben Maurer <bmaurer@ximian.com>

	* configure.in, */Makefile.am: fix up lib/lib64 type stuff

svn path=/trunk/mono/; revision=42277

diff --git a/ChangeLog b/ChangeLog
index 152a8200b962d04e41667fb443157275064ab56e..1daf5dc64705f6f1165a0ee45ab7f0100aec0805 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-26  Ben Maurer  <bmaurer@ximian.com>
+
+       * configure.in, */Makefile.am: fix up lib/lib64 type stuff
+
 2005-03-24  Raja R Harinath  <rharinath@novell.com>
 
        * configure.in (libgdiplus): Make more intuitive.

diff --git a/configure.in b/configure.in
index f715961619cee2c30845a97022124eb1b2f69937..62bbb05b2b6d7b01ddb997528f5d34b41c3297a1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1677,7 +1677,7 @@ runtime/Makefile
 
   echo "prefix=$prefix" > $srcdir/$mcsdir/build/config.make
   echo "exec_prefix=$exec_prefix" >> $srcdir/$mcsdir/build/config.make
-  echo "libdir=$libdir" >> $srcdir/$mcsdir/build/config.make
+  echo "libdir=$prefix/lib" >> $srcdir/$mcsdir/build/config.make
   echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$mcsdir/build/config.make
 )
 

diff --git a/mono/metadata/Makefile.am b/mono/metadata/Makefile.am
index 3feba0ef287c8ca43191c50afabee4cd8795b131..619db97c66f0e16cbd216d70f0c8553887a29810 100644 (file)
--- a/mono/metadata/Makefile.am
+++ b/mono/metadata/Makefile.am
@@ -10,7 +10,7 @@ confdir = `cygpath -m "${sysconfdir}"`
 AM_CFLAGS = -O
 PLATFORM_LIB = ../os/libmonoos.la
 else
-assembliesdir = $(libdir)
+assembliesdir = $(prefix)/lib
 confdir = $(sysconfdir)
 endif
 

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 51a22c87386bb03a2ac6666732f7ac7e55ef5064..a9f2e391caa5c43d03ca0ea22f4a566a385b47ec 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -53,8 +53,8 @@ mono_one_instdir = $(shell cygpath -m $(libdir))/mono/1.0
 mono_two_instdir = $(shell cygpath -m $(libdir))/mono/2.0
 else
 plat_bindir = $(bindir)
-mono_one_instdir = $(libdir)/mono/1.0
-mono_two_instdir = $(libdir)/mono/2.0
+mono_one_instdir = $(prefix)/lib/mono/1.0
+mono_two_instdir = $(prefix)/lib/mono/2.0
 endif
 
 REWRITE = sed \