From: Alan T. DeKok <aland@freeradius.org>
Date: Sun, 16 Sep 2012 07:38:32 +0000 (+0200)
Subject: Better errors.  Use install path, if it exists
X-Git-Tag: release_3_0_0_beta1~1708
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ca6b5697c79ebc8ef871595a4a1d7b0cd3399f1;p=thirdparty%2Ffreeradius-server.git

Better errors.  Use install path, if it exists
---

diff --git a/scripts/jlibtool.c b/scripts/jlibtool.c
index f4dceb7b409..14984c3e616 100644
--- a/scripts/jlibtool.c
+++ b/scripts/jlibtool.c
@@ -2028,9 +2028,18 @@ static void link_fixup(command_t *c)
 #ifdef DYNAMIC_INSTALL_NAME
             push_count_chars(c->shared_opts.normal, DYNAMIC_INSTALL_NAME);
 
+	    if (!c->install_path) {
+		    fprintf(stderr, "Installation mode requires -rpath\n");
+		    exit(1);
+	    }
+
             tmp = (char*)malloc(PATH_MAX);
             strcpy(tmp, c->install_path);
-            strcat(tmp, strrchr(c->shared_name.normal, '/'));
+	    if (c->shared_name.install) {
+		    strcat(tmp, strrchr(c->shared_name.install, '/'));
+	    } else {
+		    strcat(tmp, strrchr(c->shared_name.normal, '/'));
+	    }
             push_count_chars(c->shared_opts.normal, tmp);
 #endif
         }