From 4381ebfe7f32bf4b1c49b272356496739ed06da0 Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Sun, 10 Sep 2017 15:51:19 +0200
Subject: [PATCH] Do not automatically set RPATH to installation target (for
 building packages).

---
 build.sh        | 18 ++++++++++++++++--
 src/klayout.pri |  4 +++-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/build.sh b/build.sh
index 82b4565d6..7912fb492 100755
--- a/build.sh
+++ b/build.sh
@@ -39,6 +39,7 @@ RUBY=""
 PYTHON=""
 BUILD=""
 BIN=""
+RPATH=""
 
 MAKE_OPT=""
 
@@ -124,6 +125,10 @@ while [ "$*" != "" ]; do
     BIN="$1"
     shift
     ;;
+  -rpath)
+    RPATH="$1"
+    shift
+    ;;
   -qt4)
     HAVE_QT5=0
     ;;
@@ -150,6 +155,7 @@ while [ "$*" != "" ]; do
     echo "  -python <prog>        Use Python interpreter 'prog'"
     echo "  -build <path>         Directory where to do the build"
     echo "  -bin|-prefix <path>   Directory where to install the binary"
+    echo "  -rpath <rpath>        Specifies the RPATH to use (default: same as -bin)"
     echo "  -option <option>      'make' options (i.e. -j2)"
     echo ""
     echo "  -with-qtbinding       Create Qt bindings for ruby scripts [default]"
@@ -366,6 +372,12 @@ fi
 if [ $HAVE_64BIT_COORD != 0 ]; then
   echo "    64 bit coordinates enabled"
 fi
+if [ "$RPATH" = "" ]; then
+  RPATH="$BIN"
+fi
+
+echo "    Installation target is $BIN"
+echo "    Build directory is $BUILD"
 
 # Check Ruby installation
 if [ "$RUBYINCLUDE" != "" ]; then
@@ -476,7 +488,8 @@ qmake_cmd="$QMAKE $CURR_DIR/src/klayout.pro -recursive \
   HAVE_QTBINDINGS=$HAVE_QTBINDINGS \
   HAVE_64BIT_COORD=$HAVE_64BIT_COORD \
   HAVE_QT5=$HAVE_QT5 \
-  PREFIX=$BIN \
+  PREFIX='$BIN' \
+  RPATH='$RPATH' \
   KLAYOUT_VERSION=$KLAYOUT_VERSION \
   KLAYOUT_VERSION_DATE=$KLAYOUT_VERSION_DATE \
   KLAYOUT_VERSION_REV=$KLAYOUT_VERSION_REV \
@@ -507,7 +520,8 @@ cd $BUILD
 $MAKE_PRG install
 cd $CURR_DIR
 echo ""
-echo "Build done."
+echo "Build successfully done."
+echo "Artefacts were installed to $BIN"
 
 exit 0
 
diff --git a/src/klayout.pri b/src/klayout.pri
index 00d0b3f39..684be68ba 100644
--- a/src/klayout.pri
+++ b/src/klayout.pri
@@ -49,7 +49,9 @@ equals(HAVE_RUBY, "1") {
     HAVE_RUBY_VERSION_CODE=$$RUBYVERSIONCODE 
 }
 
-QMAKE_RPATHDIR += $$PREFIX
+!isEmpty(RPATH) {
+  QMAKE_RPATHDIR += $$RPATH
+}
 
 QMAKE_CXXFLAGS_WARN_ON += \
     -pedantic \