Better errors. Use install path, if it exists

diff --git a/scripts/jlibtool.c b/scripts/jlibtool.c
index f4dceb7b40965a0c37555c2751a39a29ceb730ee..14984c3e616452960b1d81393b629542f5258762 100644 (file)
--- 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
         }