$NetBSD: patch-af,v 1.5 2003/02/16 23:08:57 seb Exp $ --- contrib/Makefile.in.orig Fri Oct 11 18:42:55 2002 +++ contrib/Makefile.in @@ -88,7 +88,7 @@ ZLIB_CFLAGS = @ZLIB_CFLAGS@ ZLIB_LIB_DIR = @ZLIB_LIB_DIR@ SUBDIRS = trytime -contribdir = $(prefix)/contrib +contribdir = $(prefix)/share/rrdtool/contrib contrib_DATA = README EXTRA_DIST = rrdview log2rrd rrd-file-icon rrdproc rrdlastds add_ds killspike rrdfetchnames snmpstats rrdexplorer php3 php4 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs @@ -103,12 +103,12 @@ PACKAGE = @PACKAGE@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps contrib/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps contrib/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ @@ -231,7 +231,7 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \