From: ellson <devnull@localhost>
Date: Tue, 26 Sep 2006 18:40:55 +0000 (+0000)
Subject: fix bug in contruction of relocated plugin libdir
X-Git-Tag: LAST_LIBGRAPH~32^2~5849
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=58b30df3327ab3069176ad19d63cb958aee09c9e;p=graphviz

fix bug in contruction of relocated plugin libdir
---

diff --git a/graphviz.spec.in b/graphviz.spec.in
index ea0bd9fd8..985784654 100644
--- a/graphviz.spec.in
+++ b/graphviz.spec.in
@@ -135,7 +135,7 @@ of graphs (as in nodes and edges, not as in barcharts).
 
 # run "dot -c" to generate plugin config in %{_libdir}/graphviz/config
 %post
-LD_LIBRARY_PATH=$RPM_INSTALL_PREFIX0/%{_lib}/graphviz:$RPM_INSTALL_PREFIX0/%{_lib} $RPM_INSTALL_PREFIX0/bin/dot -c
+LD_LIBRARY_PATH=$RPM_INSTALL_PREFIX0/%{_lib} $RPM_INSTALL_PREFIX0/bin/dot -c
 
 # if there is no dot after everything else is done, the remove config
 %postun
@@ -155,7 +155,7 @@ graphviz plugin for renderers based on gd
 
 # run "dot -c" to generate plugin config in %{_libdir}/graphviz/config
 %post gd
-LD_LIBRARY_PATH=$RPM_INSTALL_PREFIX0/%{_lib}/graphviz $RPM_INSTALL_PREFIX0/bin/dot -c
+LD_LIBRARY_PATH=$RPM_INSTALL_PREFIX0/%{_lib} $RPM_INSTALL_PREFIX0/bin/dot -c
 
 # if there is not dot after everything else is done, the remove config
 %postun gd
diff --git a/lib/gvc/gvconfig.c b/lib/gvc/gvconfig.c
index ef01ebb69..0652e873c 100644
--- a/lib/gvc/gvconfig.c
+++ b/lib/gvc/gvconfig.c
@@ -260,7 +260,7 @@ char * gvconfig_libdir(void)
 		    /* Check for real /lib dir. Don't accept pre-install /.libs */
 		    if (strcmp(strrchr(path,'/'), "/.libs") == 0)
 			continue;
-		    strcpy(line, tmp);  /*use line buffer for result */
+		    strcpy(line, path);  /* use line buffer for result */
 		    strcat(line, "/graphviz");  /* plugins are in "graphviz" subdirectory */
 		    libdir = line;
 		    break;