From d61552445f5abcfa1df09e4a4990673a0c316675 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 22 Feb 2013 15:07:37 +0200
Subject: Add sypport for specifying libexec directory

---
 binary/linux-gnu/build-dist | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'binary/linux-gnu/build-dist')

diff --git a/binary/linux-gnu/build-dist b/binary/linux-gnu/build-dist
index 3dfbd62..6d8c179 100755
--- a/binary/linux-gnu/build-dist
+++ b/binary/linux-gnu/build-dist
@@ -4,6 +4,7 @@
 #
 # -rebuild
 # -arch
+# -libexecdir
 #
 trap 'exit 1' ERR
 
@@ -15,6 +16,7 @@ function error ()
 rebuild=n
 
 arch=x86_64-linux-gnu
+libexecdir=lib
 rebuild=n
 
 while [ $# -gt 0 ]; do
@@ -28,6 +30,11 @@ while [ $# -gt 0 ]; do
       arch=$1
       shift
       ;;
+    -libexecdir)
+      shift
+      libexecdir=$1
+      shift
+      ;;
     *)
       error "unknown option: $1"
       exit 1
@@ -98,7 +105,7 @@ cd ..
 cd odb
 
 if [ $rebuild = y ]; then
-  ../odb-configure $over $arch $install_root
+  ../odb-configure $over $arch $install_root $libexecdir
 fi
 
 make
@@ -110,7 +117,7 @@ cd ..
 cd libodb
 
 if [ $rebuild = y ]; then
-  ../libodb-configure $install_root/lib/odb/$arch
+  ../libodb-configure $install_root/$libexecdir/odb/$arch
 fi
 
 make
@@ -123,7 +130,7 @@ cd ../..
 cd libodb-boost
 
 if [ $rebuild = y ]; then
-  ../libodb-boost-configure $install_root/lib/odb/$arch
+  ../libodb-boost-configure $install_root/$libexecdir/odb/$arch
 fi
 
 make
@@ -135,7 +142,7 @@ cd ..
 cd libodb-qt
 
 if [ $rebuild = y ]; then
-  ../libodb-qt-configure $install_root/lib/odb/$arch
+  ../libodb-qt-configure $install_root/$libexecdir/odb/$arch
 fi
 
 make
@@ -144,7 +151,7 @@ cd ..
 
 # Copy /$arch over to installation
 #
-cp -r /$arch $install_root/lib/odb/
+cp -r /$arch $install_root/$libexecdir/odb/
 
 # Copy the default options file.
 #
@@ -166,7 +173,7 @@ fi
 
 # Copy manifest and README.
 #
-cp -L manifest $install_root/lib/odb/$arch/
+cp -L manifest $install_root/$libexecdir/odb/$arch/
 cp -L README $install_root/
 
 # Move doc and man out of share/
@@ -176,7 +183,6 @@ mv $install_root/share/man $install_root/
 mv $install_root/share/doc/odb $install_root/doc
 rm -r $install_root/share
 
-
 # Clean some things up.
 #
 rm -f `find $install_root -name '*.la'`
@@ -184,7 +190,7 @@ rm -f `find $install_root -name '*.la'`
 # Remove features.h from include-fixed. This file causes trouble on newer
 # distributions.
 #
-include_fixed=`find $install_root/lib/odb/$arch -type d -name include-fixed`
+include_fixed=`find $install_root/$libexecdir/odb/$arch -type d -name include-fixed`
 rm $include_fixed/features.h
 
 # Pack it up.
-- 
cgit v1.1