$NetBSD: patch-as,v 1.8 2004/12/24 18:26:57 seb Exp $ --- dotneato/Makefile.in.orig 2004-12-11 20:43:23.000000000 +0000 +++ dotneato/Makefile.in @@ -68,8 +68,7 @@ am__vpath_adj = case $$p in \ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" \ "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \ - "$(DESTDIR)$(pdfdir)" "$(DESTDIR)$(pkgconfigdir)" \ - "$(DESTDIR)$(pkgincludedir)" + "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgincludedir)" pkglibLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(pkglib_LTLIBRARIES) libdotneato_la_DEPENDENCIES = \ @@ -163,9 +162,8 @@ RECURSIVE_TARGETS = all-recursive check- man1dir = $(mandir)/man1 NROFF = nroff MANS = $(man_MANS) -pdfDATA_INSTALL = $(INSTALL_DATA) pkgconfigDATA_INSTALL = $(INSTALL_DATA) -DATA = $(pdf_DATA) $(pkgconfig_DATA) +DATA = $(pkgconfig_DATA) pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER) HEADERS = $(pkginclude_HEADERS) ETAGS = etags @@ -271,7 +269,6 @@ SOCKET_LIBS = @SOCKET_LIBS@ SORT = @SORT@ STRIP = @STRIP@ TCLINT_INCLUDES = @TCLINT_INCLUDES@ -TCLSH = @TCLSH@ TCL_CFLAGS = @TCL_CFLAGS@ TCL_DEFS = @TCL_DEFS@ TCL_INCLUDES = @TCL_INCLUDES@ @@ -297,7 +294,6 @@ TK_VERSION = @TK_VERSION@ TK_XINCLUDES = @TK_XINCLUDES@ TOP_DIR = @TOP_DIR@ VERSION = @VERSION@ -WISH = @WISH@ WITH_MYLIBGD_FALSE = @WITH_MYLIBGD_FALSE@ WITH_MYLIBGD_TRUE = @WITH_MYLIBGD_TRUE@ WITH_TCL_FALSE = @WITH_TCL_FALSE@ @@ -365,8 +361,7 @@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ SUBDIRS = common gvrender pack dotgen neatogen twopigen fdpgen circogen gvre_svg -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 AM_CPPFLAGS = \ @@ -388,7 +383,6 @@ pkglib_LTLIBRARIES = libdotneato.la pkgconfig_DATA = libdotneato.pc bin_SCRIPTS = dotneato-config man_MANS = dot.1 dotneato-config.1 -pdf_DATA = dot.pdf dotneato-config.pdf libdotneato_la_SOURCES = dotneato.c libdotneato_la_LIBADD = \ $(top_builddir)/dotneato/common/libcommon.la \ @@ -679,23 +673,6 @@ uninstall-man1: echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ done -install-pdfDATA: $(pdf_DATA) - @$(NORMAL_INSTALL) - test -z "$(pdfdir)" || $(mkdir_p) "$(DESTDIR)$(pdfdir)" - @list='$(pdf_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(pdfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \ - $(pdfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \ - done - -uninstall-pdfDATA: - @$(NORMAL_UNINSTALL) - @list='$(pdf_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \ - rm -f "$(DESTDIR)$(pdfdir)/$$f"; \ - done install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)" @@ -899,7 +876,7 @@ all-am: Makefile $(LTLIBRARIES) $(PROGRA $(HEADERS) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(pdfdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgincludedir)"; do \ + for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgincludedir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-recursive @@ -948,7 +925,7 @@ info: info-recursive info-am: -install-data-am: install-man install-pdfDATA install-pkgconfigDATA \ +install-data-am: install-man install-pkgconfigDATA \ install-pkgincludeHEADERS @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook @@ -981,9 +958,8 @@ ps: ps-recursive ps-am: uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ - uninstall-info-am uninstall-man uninstall-pdfDATA \ - uninstall-pkgconfigDATA uninstall-pkgincludeHEADERS \ - uninstall-pkglibLTLIBRARIES + uninstall-info-am uninstall-man uninstall-pkgconfigDATA \ + uninstall-pkgincludeHEADERS uninstall-pkglibLTLIBRARIES @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) uninstall-hook @@ -1000,29 +976,27 @@ uninstall-man: uninstall-man1 install install-am install-binPROGRAMS install-binSCRIPTS \ install-data install-data-am install-data-hook install-exec \ install-exec-am install-info install-info-am install-man \ - install-man1 install-pdfDATA install-pkgconfigDATA \ - install-pkgincludeHEADERS install-pkglibLTLIBRARIES \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ + install-man1 install-pkgconfigDATA install-pkgincludeHEADERS \ + install-pkglibLTLIBRARIES install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic maintainer-clean-recursive \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am \ uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-hook \ uninstall-info-am uninstall-man uninstall-man1 \ - uninstall-pdfDATA uninstall-pkgconfigDATA \ - uninstall-pkgincludeHEADERS uninstall-pkglibLTLIBRARIES + uninstall-pkgconfigDATA uninstall-pkgincludeHEADERS \ + uninstall-pkglibLTLIBRARIES install-data-hook: (cd $(DESTDIR)$(man1dir); for i in $(linkedman); do rm -f $$i; $(LN_S) dot.1 $$i; done;) - (cd $(DESTDIR)$(pdfdir); for i in $(linkedpdf); do rm -f $$i; $(LN_S) dot.pdf $$i; done;) #install-exec-hook: # (cd $(DESTDIR)$(bindir); for i in $(linkedprogram); do rm -f $$i; $(LN_S) dot $$i; done;) uninstall-hook: (cd $(DESTDIR)$(man1dir); for i in $(linkedman); do rm -f $$i; done;) - (cd $(DESTDIR)$(pdfdir); for i in $(linkedpdf); do rm -f $$i; done;) # (cd $(DESTDIR)$(bindir); for i in $(linkedprogram); do rm -f $$i; done;) dot.pdf: $(top_srcdir)/dotneato/dot.1