From 01d04ce25d5621a9cc47f939cbd7ef85a77fa42c Mon Sep 17 00:00:00 2001 From: ellson Date: Sun, 23 Jan 2005 01:13:42 +0000 Subject: [PATCH] some "upstream" changes suggested (Fedora QA) - put pkgconfig files in official directory - lefty/dotty "scripts" don't need to be executable --- cmd/dot/Makefile.am | 2 +- cmd/dotty/Makefile.am | 8 +++----- cmd/lefty/Makefile.am | 4 ++-- cmd/lefty/examples/Makefile.am | 4 +--- graphviz.spec.in | 4 ++-- lib/agraph/Makefile.am | 2 +- lib/cdt/Makefile.am | 2 +- lib/circogen/Makefile.am | 2 +- lib/common/Makefile.am | 2 +- lib/dotgen/Makefile.am | 2 +- lib/fdpgen/Makefile.am | 2 +- lib/graph/Makefile.am | 2 +- lib/gvc/Makefile.am | 2 +- lib/neatogen/Makefile.am | 2 +- lib/pack/Makefile.am | 2 +- lib/pathplan/Makefile.am | 2 +- lib/twopigen/Makefile.am | 2 +- 17 files changed, 21 insertions(+), 25 deletions(-) diff --git a/cmd/dot/Makefile.am b/cmd/dot/Makefile.am index b25cdf094..5fc1a4a4f 100644 --- a/cmd/dot/Makefile.am +++ b/cmd/dot/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in pdfdir = $(pkgdatadir)/doc/pdf -pkgconfigdir = $(pkglibdir)/pkgconfig +pkgconfigdir = $(libdir)/pkgconfig linkedman = neato.1 twopi.1 fdp.1 circo.1 linkedpdf = neato.pdf twopi.pdf fdp.pdf circo.pdf diff --git a/cmd/dotty/Makefile.am b/cmd/dotty/Makefile.am index bebedb079..0722c12e1 100644 --- a/cmd/dotty/Makefile.am +++ b/cmd/dotty/Makefile.am @@ -1,8 +1,5 @@ ## Process this file with automake to produce Makefile.in -DOTTYSCRIPTS = dotty.lefty dotty_draw.lefty dotty_edit.lefty \ - dotty_layout.lefty dotty_ui.lefty - man = dotty.1 pdf = dotty.pdf @@ -12,7 +9,8 @@ pdfdir = $(pkgdatadir)/doc/pdf man_MANS = $(man) pdf_DATA = $(pdf) bin_SCRIPTS = dotty -lefty_SCRIPTS = $(DOTTYSCRIPTS) +lefty_DATA = dotty.lefty dotty_draw.lefty dotty_edit.lefty \ + dotty_layout.lefty dotty_ui.lefty dotty: $(top_srcdir)/cmd/dotty/dotty.sh cp $(top_srcdir)/cmd/dotty/dotty.sh dotty @@ -21,7 +19,7 @@ dotty: $(top_srcdir)/cmd/dotty/dotty.sh .1.pdf: groff -Tps -man $< | ps2pdf - - >$@ -EXTRA_DIST = $(DOTTYSCRIPTS) $(man) $(pdf) \ +EXTRA_DIST = $(man) $(pdf) \ dotty.bsh dotty.ksh dotty.sh \ Makefile.old notes mswin32 diff --git a/cmd/lefty/Makefile.am b/cmd/lefty/Makefile.am index 8744c5c26..b4c303d51 100644 --- a/cmd/lefty/Makefile.am +++ b/cmd/lefty/Makefile.am @@ -23,7 +23,7 @@ man_MANS = $(man) pdf_DATA = $(pdf) endif -lefty_SCRIPTS = lefty.psp +lefty_DATA = lefty.psp lefty_SOURCES = code.c common.c display.c exec.c g.c gfxview.c internal.c \ lefty.c lex.c mem.c parse.c str.c tbl.c txtview.c @@ -42,7 +42,7 @@ lefty_LDADD = $(top_builddir)/cmd/lefty/dot2l/libdot2l.la \ .1.pdf: groff -Tps -man $< | ps2pdf - - >$@ -EXTRA_DIST = $(lefty_SCRIPTS) $(lefty_SOURCES) $(man) $(pdf) \ +EXTRA_DIST = $(man) $(pdf) \ colors.txt Makefile.old aix_mods DISTCLEANFILES = $(pdf) diff --git a/cmd/lefty/examples/Makefile.am b/cmd/lefty/examples/Makefile.am index dfa751d2b..316f28d3a 100644 --- a/cmd/lefty/examples/Makefile.am +++ b/cmd/lefty/examples/Makefile.am @@ -2,7 +2,5 @@ leftydir = $(pkgdatadir)/lefty -lefty_SCRIPTS = box.lefty def.lefty fractal.lefty fractal2.lefty \ +lefty_DATA = box.lefty def.lefty fractal.lefty fractal2.lefty \ slides.lefty tree.lefty - -EXTRA_DIST = $(lefty_SCRIPTS) diff --git a/graphviz.spec.in b/graphviz.spec.in index 92c800671..950fac1d4 100644 --- a/graphviz.spec.in +++ b/graphviz.spec.in @@ -124,8 +124,8 @@ make DESTDIR="$RPM_BUILD_ROOT" install %{_includedir}/%{name} %{_libdir}/%{name}/*.*a %{_libdir}/%{name}/*.so -%dir %{_libdir}/%{name}/pkgconfig -%{_libdir}/%{name}/pkgconfig/*.pc +%dir %{_libdir}/pkgconfig +%{_libdir}/pkgconfig/*.pc %{_mandir}/man3/* %exclude %{_libdir}/%{name}/lib*tcl*.* %exclude %{_libdir}/%{name}/libtk*.* diff --git a/lib/agraph/Makefile.am b/lib/agraph/Makefile.am index 0cfea4c7f..847996fe9 100644 --- a/lib/agraph/Makefile.am +++ b/lib/agraph/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in pdfdir = $(pkgdatadir)/doc/pdf -pkgconfigdir = $(pkglibdir)/pkgconfig +pkgconfigdir = $(libdir)/pkgconfig pdf = agraph.pdf man = agraph.3 diff --git a/lib/cdt/Makefile.am b/lib/cdt/Makefile.am index 208c78b26..b2a9bce9a 100644 --- a/lib/cdt/Makefile.am +++ b/lib/cdt/Makefile.am @@ -2,7 +2,7 @@ pdfdir = $(pkgdatadir)/doc/pdf pkgextraincludedir = $(pkgincludedir) -pkgconfigdir = $(pkglibdir)/pkgconfig +pkgconfigdir = $(libdir)/pkgconfig man = cdt.3 pdf = cdt.pdf diff --git a/lib/circogen/Makefile.am b/lib/circogen/Makefile.am index 7b88fabf9..ed504a5e4 100644 --- a/lib/circogen/Makefile.am +++ b/lib/circogen/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -pkgconfigdir = $(pkglibdir)/pkgconfig +pkgconfigdir = $(libdir)/pkgconfig AM_CPPFLAGS = \ -I$(top_srcdir) \ diff --git a/lib/common/Makefile.am b/lib/common/Makefile.am index b818117fc..ab182174c 100644 --- a/lib/common/Makefile.am +++ b/lib/common/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -pkgconfigdir = $(pkglibdir)/pkgconfig +pkgconfigdir = $(libdir)/pkgconfig AM_CPPFLAGS = \ -I$(top_srcdir) \ diff --git a/lib/dotgen/Makefile.am b/lib/dotgen/Makefile.am index 356621336..17652689e 100644 --- a/lib/dotgen/Makefile.am +++ b/lib/dotgen/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -pkgconfigdir = $(pkglibdir)/pkgconfig +pkgconfigdir = $(libdir)/pkgconfig AM_CPPFLAGS = \ -I$(top_srcdir) \ diff --git a/lib/fdpgen/Makefile.am b/lib/fdpgen/Makefile.am index e18990c4b..24acb68a5 100644 --- a/lib/fdpgen/Makefile.am +++ b/lib/fdpgen/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -pkgconfigdir = $(pkglibdir)/pkgconfig +pkgconfigdir = $(libdir)/pkgconfig AM_CPPFLAGS = \ -I$(top_srcdir) \ diff --git a/lib/graph/Makefile.am b/lib/graph/Makefile.am index c8524e7d1..40c6815a5 100644 --- a/lib/graph/Makefile.am +++ b/lib/graph/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in pdfdir = $(pkgdatadir)/doc/pdf -pkgconfigdir = $(pkglibdir)/pkgconfig +pkgconfigdir = $(libdir)/pkgconfig man = graph.3 pdf = graph.pdf diff --git a/lib/gvc/Makefile.am b/lib/gvc/Makefile.am index 4449a38f6..add51bf2f 100644 --- a/lib/gvc/Makefile.am +++ b/lib/gvc/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -pkgconfigdir = $(pkglibdir)/pkgconfig +pkgconfigdir = $(libdir)/pkgconfig # FIXME - need to get cairo dependencies out of gvemit.c so that @CAIRO...@ can go from here diff --git a/lib/neatogen/Makefile.am b/lib/neatogen/Makefile.am index 8b4433c30..be754761b 100644 --- a/lib/neatogen/Makefile.am +++ b/lib/neatogen/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -pkgconfigdir = $(pkglibdir)/pkgconfig +pkgconfigdir = $(libdir)/pkgconfig AM_CPPFLAGS = \ -I$(top_srcdir) \ diff --git a/lib/pack/Makefile.am b/lib/pack/Makefile.am index 7b21f7a57..925c27202 100644 --- a/lib/pack/Makefile.am +++ b/lib/pack/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in pdfdir = $(pkgdatadir)/doc/pdf -pkgconfigdir = $(pkglibdir)/pkgconfig +pkgconfigdir = $(libdir)/pkgconfig AM_CPPFLAGS = -I$(top_srcdir) \ -I$(top_srcdir)/lib/common \ diff --git a/lib/pathplan/Makefile.am b/lib/pathplan/Makefile.am index b004412e3..455ac8797 100644 --- a/lib/pathplan/Makefile.am +++ b/lib/pathplan/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in pdfdir = $(pkgdatadir)/doc/pdf -pkgconfigdir = $(pkglibdir)/pkgconfig +pkgconfigdir = $(libdir)/pkgconfig man = pathplan.3 pdf = pathplan.pdf diff --git a/lib/twopigen/Makefile.am b/lib/twopigen/Makefile.am index 39bf312e6..35f284885 100644 --- a/lib/twopigen/Makefile.am +++ b/lib/twopigen/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -pkgconfigdir = $(pkglibdir)/pkgconfig +pkgconfigdir = $(libdir)/pkgconfig AM_CPPFLAGS = \ -I$(top_srcdir) \ -- 2.40.0