From f64749b19c20c6985e70d31c4d060c9cb19b77e9 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 3 May 2012 13:11:45 +0000
Subject: more gtk stack script fixes - don't use awk to find directories and
 set LD_LIBRARY_PATH correctly for non-OSX

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@12163 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 tools/build-gtk-stack | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/build-gtk-stack b/tools/build-gtk-stack
index 3f4c809ee3..84d4d24d41 100755
--- a/tools/build-gtk-stack
+++ b/tools/build-gtk-stack
@@ -44,7 +44,12 @@ if [ $clean ] ; then
         echo "This doesn't appear to be your source directory. Don't run --clean here."
         exit 1
     fi
-    rm -rf `ls -ld * | awk '/^d/ {print $9;}' | grep -v gtk+`
+    rm -rf `find -maxdepth 1 -type d | grep -v -e "gtk+" -e "^.$"`
+    pushd gtk+
+    if [ -e Makefile ] ; then
+        make clean
+    fi
+    popd
     # have to use sudo because we used sudo for libxml2 install, sigh.
     sudo rm -rf $PREFIX
     exit 0
@@ -78,7 +83,7 @@ if uname -a | grep --silent arwin ; then
     
     need_iconv=yes
 else 
-    export LD_LIBRARY_PATH=$PREFIX/lib{$LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+    export LD_LIBRARY_PATH=$PREFIX/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
     GLOBAL_CFLAGS=
     GLOBAL_LDFLAGS=
     CAIRO_CONF=
-- 
cgit v1.2.3