fix bug in contruction of relocated plugin libdir

diff --git a/graphviz.spec.in b/graphviz.spec.in
index ea0bd9fd85a3c139d40ed7df39445e6ba8e04293..98578465467cd7eac9108baefc06c4c5b8a97cdb 100644 (file)
--- 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 ef01ebb696361d141bdd4cde42ec24a38c333433..0652e873c59c257b7e0495a400d4261c7348c13c 100644 (file)
--- 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;