From: ellson <devnull@localhost>
Date: Tue, 26 Sep 2006 16:47:54 +0000 (+0000)
Subject: per frequent requests, most recently from Debian,
X-Git-Tag: LAST_LIBGRAPH~32^2~5865
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4e23e443676795b3c9c0dab647f25a6e0baa098b;p=graphviz

per frequent requests, most recently from Debian,
move shared libs to $PREFIX/lib   (from $PREFIX/graphviz/lib)
	libcdt, libgraph, libagraph, libgvc, libpack, libexpr, libpathplan
add missing .3 and .pc
---

diff --git a/graphviz.spec.in b/graphviz.spec.in
index 0651719af..756dc1a9d 100644
--- a/graphviz.spec.in
+++ b/graphviz.spec.in
@@ -125,6 +125,7 @@ of graphs (as in nodes and edges, not as in barcharts).
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_bindir}/*
 %dir %{_libdir}/graphviz
+%{_libdir}/*.so.*
 %{_libdir}/graphviz/*.so.*
 %{_mandir}/man1/*.1*
 %dir %{_datadir}/graphviz
@@ -134,9 +135,9 @@ 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/bin/dot -c
+LD_LIBRARY_PATH=$RPM_INSTALL_PREFIX0/%{_lib}/graphviz:$RPM_INSTALL_PREFIX0/%{_lib} $RPM_INSTALL_PREFIX0/bin/dot -c
 
-# if there is not dot after everything else is done, the remove config
+# if there is no dot after everything else is done, the remove config
 %postun
 if ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_lib}/graphviz/config; fi
 
diff --git a/lib/agraph/Makefile.am b/lib/agraph/Makefile.am
index c1bee5fe5..9b21b8cd2 100644
--- a/lib/agraph/Makefile.am
+++ b/lib/agraph/Makefile.am
@@ -4,19 +4,16 @@
 pdfdir = $(pkgdatadir)/doc/pdf
 pkgconfigdir = $(libdir)/pkgconfig
 
-pdf = agraph.pdf
-man = agraph.3
-
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/lib/cdt
 
 pkginclude_HEADERS = aghdr.h agraph.h malloc.h vmstub.h grammar.h
 noinst_LTLIBRARIES = libagraph_C.la
-pkglib_LTLIBRARIES = libagraph.la
+lib_LTLIBRARIES = libagraph.la
 pkgconfig_DATA = libagraph.pc
-man_MANS = $(man)
-pdf_DATA = $(pdf)
+man_MANS = agraph.3
+pdf_DATA = agraph.pdf
 
 libagraph_C_la_SOURCES = agerror.c apply.c attr.c \
 	edge.c flatten.c grammar.y graph.c id.c imap.c io.c \
@@ -46,8 +43,8 @@ grammar.h: y.output
 .3.pdf:
 	-groff -Tps -man $< | ps2pdf - - >$@
 
-EXTRA_DIST = $(man) $(pdf) Makefile.old cmpnd.c dotdge.c \
+EXTRA_DIST = $(man_MANS) $(pdf_DATA) Makefile.old cmpnd.c dotdge.c \
 	main.c tester.c README grammar.c grammar.h scan.c \
 	y.tab.c y.tab.h y.output
 
-DISTCLEANFILES = $(pdf) grammar.[ch] scan.c y.output y.tab.[ch]
+DISTCLEANFILES = $(pdf_DATA) grammar.[ch] scan.c y.output y.tab.[ch]