$NetBSD: patch-bs,v 1.1 2004/11/29 22:11:51 seb Exp $

--- tools/expr/Makefile.in.orig	2004-09-14 22:13:35.000000000 +0000
+++ tools/expr/Makefile.in
@@ -15,7 +15,6 @@
 @SET_MAKE@
 
 
-
 SOURCES = $(libexpr_la_SOURCES) $(libexprconvenience_la_SOURCES)
 
 srcdir = @srcdir@
@@ -58,7 +57,7 @@ am__vpath_adj = case $$p in \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(man3dir)" \
-	"$(DESTDIR)$(pdfdir)" "$(DESTDIR)$(pkgincludedir)"
+	"$(DESTDIR)$(pkgincludedir)"
 pkglibLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkglib_LTLIBRARIES)
 libexpr_la_LIBADD =
@@ -92,8 +91,6 @@ DIST_SOURCES = $(libexpr_la_SOURCES) $(l
 man3dir = $(mandir)/man3
 NROFF = nroff
 MANS = $(man_MANS)
-pdfDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(pdf_DATA)
 pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER)
 HEADERS = $(pkginclude_HEADERS)
 ETAGS = etags
@@ -198,7 +195,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@
@@ -224,7 +220,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@
@@ -291,7 +286,6 @@ target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-pdfdir = $(pkgdatadir)/doc/pdf
 AM_CPPFLAGS = \
         -I$(top_srcdir) \
         -I$(top_srcdir)/tools/vmalloc \
@@ -303,7 +297,6 @@ pkginclude_HEADERS = exgram.h exlib.h ex
 pkglib_LTLIBRARIES = libexpr.la
 noinst_LTLIBRARIES = libexprconvenience.la
 man_MANS = expr.3
-pdf_DATA = expr.pdf
 libexpr_la_SOURCES = excc.c excontext.c exdata.c exerror.c \
 	exeval.c exexpr.c exlexname.c exopen.c exrewind.c extoken.c \
 	extype.c exzero.c exparse.y
@@ -486,23 +479,6 @@ uninstall-man3:
 	  echo " rm -f '$(DESTDIR)$(man3dir)/$$inst'"; \
 	  rm -f "$(DESTDIR)$(man3dir)/$$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-pkgincludeHEADERS: $(pkginclude_HEADERS)
 	@$(NORMAL_INSTALL)
 	test -z "$(pkgincludedir)" || $(mkdir_p) "$(DESTDIR)$(pkgincludedir)"
@@ -598,9 +574,9 @@ distdir: $(DISTFILES)
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA) $(HEADERS)
+all-am: Makefile $(LTLIBRARIES) $(MANS) $(HEADERS)
 installdirs:
-	for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(pdfdir)" "$(DESTDIR)$(pkgincludedir)"; do \
+	for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(pkgincludedir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
@@ -650,7 +626,7 @@ info: info-am
 
 info-am:
 
-install-data-am: install-man install-pdfDATA install-pkgincludeHEADERS
+install-data-am: install-man install-pkgincludeHEADERS
 
 install-exec-am: install-pkglibLTLIBRARIES
 
@@ -678,7 +654,7 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-man uninstall-pdfDATA \
+uninstall-am: uninstall-info-am uninstall-man \
 	uninstall-pkgincludeHEADERS uninstall-pkglibLTLIBRARIES
 
 uninstall-man: uninstall-man3
@@ -689,15 +665,14 @@ uninstall-man: uninstall-man3
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
 	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-man3 install-pdfDATA \
+	install-info-am install-man install-man3 \
 	install-pkgincludeHEADERS install-pkglibLTLIBRARIES \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
 	uninstall-info-am uninstall-man uninstall-man3 \
-	uninstall-pdfDATA uninstall-pkgincludeHEADERS \
-	uninstall-pkglibLTLIBRARIES
+	uninstall-pkgincludeHEADERS uninstall-pkglibLTLIBRARIES
 
 
 $(libexprconvenience_la_OBJECTS): exparse.h exparse.c exgram.h exop.h