From a94b4bc5db07d0b39f31b8bb9d177f7bd96b4b3d Mon Sep 17 00:00:00 2001
From: Cedric Vivier <cedricv@neonux.com>
Date: Mon, 3 Aug 2009 11:05:52 +0000
Subject: [PATCH] use $libdir instead of `$prefix/lib' (patch by Paul Lange)

git-svn-id: https://svn.codehaus.org/boo/boo/trunk@3375 2c1201b4-01cd-e047-a400-b836ae1fbc61
---
 configure.in.in    | 2 +-
 extras/Makefile.am | 2 +-
 extras/booc.in     | 4 ++--
 extras/booi.in     | 4 ++--
 extras/booish.in   | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index ab1c3e8de..449396328 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -14,7 +14,7 @@ AC_SUBST(RUNTIME)
 
 AC_PATH_PROG(GACUTIL, gacutil, no)
 
-GACUTIL_FLAGS='/package $(PACKAGE) /gacdir $(DESTDIR)/$(prefix)/lib'
+GACUTIL_FLAGS='/package $(PACKAGE) /gacdir $(DESTDIR)/$(libdir)'
 AC_SUBST(GACUTIL_FLAGS)
 
 AC_OUTPUT([
diff --git a/extras/Makefile.am b/extras/Makefile.am
index b93a87e84..65208273e 100644
--- a/extras/Makefile.am
+++ b/extras/Makefile.am
@@ -1,4 +1,4 @@
-pkgconfigdir = $(prefix)/lib/pkgconfig
+pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = boo.pc
 
 gtksourceviewdir = $(GTKSOURCEVIEW_PREFIX)/share/gtksourceview-1.0/language-specs/
diff --git a/extras/booc.in b/extras/booc.in
index cfb5b4e04..973953d71 100644
--- a/extras/booc.in
+++ b/extras/booc.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 if [ -x @prefix@/bin/cli ]; then
-    env @prefix@/bin/cli $MONO_OPTIONS @prefix@/lib/boo/booc.exe $BOOC_OPTIONS "$@"
+    env @prefix@/bin/cli $MONO_OPTIONS @libdir@/boo/booc.exe $BOOC_OPTIONS "$@"
 else
-    env @RUNTIME@ $MONO_OPTIONS @prefix@/lib/boo/booc.exe $BOOC_OPTIONS "$@"
+    env @RUNTIME@ $MONO_OPTIONS @libdir@/boo/booc.exe $BOOC_OPTIONS "$@"
 fi
 
diff --git a/extras/booi.in b/extras/booi.in
index a6a4e9926..3ce9409c4 100644
--- a/extras/booi.in
+++ b/extras/booi.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 if [ -x @prefix@/bin/cli ]; then
-    env @prefix@/bin/cli $MONO_OPTIONS @prefix@/lib/boo/booi.exe $BOOI_OPTIONS "$@"
+    env @prefix@/bin/cli $MONO_OPTIONS @libdir@/boo/booi.exe $BOOI_OPTIONS "$@"
 else
-    env @RUNTIME@ $MONO_OPTIONS @prefix@/lib/boo/booi.exe $BOOI_OPTIONS "$@"
+    env @RUNTIME@ $MONO_OPTIONS @libdir@/boo/booi.exe $BOOI_OPTIONS "$@"
 fi
 
diff --git a/extras/booish.in b/extras/booish.in
index 984eb5cc6..4ff188ec6 100644
--- a/extras/booish.in
+++ b/extras/booish.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 if [ -x @prefix@/bin/cli ]; then
-    env @prefix@/bin/cli $MONO_OPTIONS @prefix@/lib/boo/booish.exe $BOOISH_OPTIONS "$@"
+    env @prefix@/bin/cli $MONO_OPTIONS @libdir@/boo/booish.exe $BOOISH_OPTIONS "$@"
 else
-    env @RUNTIME@ $MONO_OPTIONS @prefix@/lib/boo/booish.exe $BOOISH_OPTIONS "$@"
+    env @RUNTIME@ $MONO_OPTIONS @libdir@/boo/booish.exe $BOOISH_OPTIONS "$@"
 fi