From f4e50548b0d41f5b4e6faae3ddc7283dd1a5dd6c Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 31 Mar 2011 20:21:13 +0200
Subject: I am to tupid for git, today.

Revert "Revert "fix conflict, autoseect libgcj""

This reverts commit c2bd3a43342e37a05a97e12581dd2bd52993877a.
---
 scripts/reloc.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'scripts/reloc.sh')

diff --git a/scripts/reloc.sh b/scripts/reloc.sh
index f7a0a1e3b..59323612f 100755
--- a/scripts/reloc.sh
+++ b/scripts/reloc.sh
@@ -1,10 +1,11 @@
 #!/usr/bin/env bash
 # execute this after relocation of adk directory
 
-olddir=$(grep "^TOPDIR" prereq.mk |cut -d '=' -f 2)
+olddir=$(grep "^TOPDIR" prereq.mk 2>/dev/null |cut -d '=' -f 2)
 newdir=$(pwd)
 
-if [ "$olddir" != "$newdir" ];then
+if [ ! -z $olddir ];then
+  if [ "$olddir" != "$newdir" ];then
 	echo "adk directory relocated!"
 	echo "old directory: $olddir"
 	echo "new directory: $newdir"
@@ -13,4 +14,5 @@ if [ "$olddir" != "$newdir" ];then
 	sed -i -e "s#$olddir#$newdir#g" $(find target_*/scripts -type f|xargs)
 	sed -i -e "s#$olddir#$newdir#" target_*/etc/ipkg.conf
 	sed -i -e "s#$olddir#$newdir#" prereq.mk
+  fi
 fi
-- 
cgit v1.2.3