From d08d45598284459691ef43f27383c5ea170bbcaf Mon Sep 17 00:00:00 2001 From: pancake Date: Sat, 14 Sep 2013 00:45:49 +0200 Subject: [PATCH] Fix install issues --- shlr/Makefile | 2 +- sys/ldconfig.sh | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/shlr/Makefile b/shlr/Makefile index 3b1bd1de43..b403dcd2e3 100644 --- a/shlr/Makefile +++ b/shlr/Makefile @@ -14,7 +14,7 @@ all: sdb/sdb done clean mrproper: - rm -f sdb/sdb + rm -f sdb/src/.sdb sdb/sdb cd sdb ; ${MAKE} clean @for a in ${MODS} ; do ${MAKE} -C $$a clean ; done diff --git a/sys/ldconfig.sh b/sys/ldconfig.sh index 903bc27062..d282b8ace8 100755 --- a/sys/ldconfig.sh +++ b/sys/ldconfig.sh @@ -4,10 +4,11 @@ if test -w $LD ; then if type ldconfig > /dev/null 2>&1 ; then mkdir -p $LD P=$(awk -F= '/^LIBDIR/{print $2}' config-user.mk) - D=`dirname $P``basename $P` + D=`dirname $P`/`basename $P` if [ /usr != "$D" ]; then echo $P > $LD/radare.conf - ldconfig + # do not update symlinks to avoid r2 install issues + ldconfig -X fi fi fi