Makefile.am: install docs when make install is run

The docs under the EXTRA_DIST variable in Makefile.am will now be
installed to $prefix/share/doc/hldig or some similar location.

Other files are part of this commit because I ran autoreconf -ivf

Makefile.am

@@ -10,9 +10,38 @@ if TESTS
 TESTDIR = test
 endif
 
-SUBDIRS = db htlib htword htcommon htnet htfuzzy htdb hldig hlsearch httools installdir include $(TESTDIR) po
+# process the Makefile.am files in these directories. the po directory
+# is a little # different because of a rule near the end of configure.ac
 
-EXTRA_DIST = config.rpath m4/ChangeLog  .version Makefile.config contrib ABOUT-NLS
+SUBDIRS = db htlib htword htcommon htnet htfuzzy htdb hldig hlsearch	\
+httools installdir include $(TESTDIR) po
+
+# files to be installed to destination docdir when 'make install' is run
+packextrasdir=@docdir@
+
+EXTRA_DIST =	\
+.version	\
+COPYING	\
+INSTALL	\
+README.md	\
+AUTHORS.md	\
+TESTING.md	\
+CONTRIBUTING.md	\
+TRANSLATING.md \
+ChangeLog.md \
+STATUS	\
+CODE_OF_CONDUCT.md
+
+packextras_DATA=$(EXTRA_DIST)
+
+# This only install the html and gif files, but not the assets (css and images)
+# in the docs directory
+# packextraswebsitedir=@docdir@/docs
+
+# WEBSITE = \
+#	docs/*.html \
+#	docs/*.gif
+# packextraswebsite_DATA=$(WEBSITE)
 
 ACLOCAL_AMFLAGS = -I m4
 
@@ -36,5 +65,9 @@ install-data-hook:
 	@echo "Before you can start searching, you will need to create a"
 	@echo "search database.  A sample script to do this has been"
 	@echo "installed as " $(DESTDIR)$(bindir)/rundig
+	@echo ""
+	@echo "To uninstall hldig, use 'make uninstall' (must be run before 'make distclean')"
+	@echo "To remove build files, use 'make distclean'"
+
 
 distdir = $(PACKAGE)-$(VERSION)

Makefile.in

@@ -25,6 +25,7 @@
 #
 # make CFLAGS=-g CXXFLAGS=-g PROFILING=-p all
 #
+
 VPATH = @srcdir@
 am__is_gnu_make = { \
   if test -z '$(MAKELEVEL)'; then \
@@ -149,6 +150,35 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(packextrasdir)"
+DATA = $(packextras_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 am__recursive_targets = \
@@ -180,8 +210,8 @@ CSCOPE = cscope
 DIST_SUBDIRS = db htlib htword htcommon htnet htfuzzy htdb hldig \
 	hlsearch httools installdir include test po
 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.config \
-	COPYING compile config.guess config.rpath config.sub \
-	install-sh ltmain.sh missing mkinstalldirs ylwrap
+	ABOUT-NLS COPYING INSTALL compile config.guess config.rpath \
+	config.sub install-sh ltmain.sh missing mkinstalldirs ylwrap
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 top_distdir = $(distdir)
 am__remove_distdir = \
@@ -412,8 +442,38 @@ HTLIBS = $(top_builddir)/htnet/libhtnet.la \
 
 LDADD = $(HTLIBS) @LIBINTL@
 @TESTS_TRUE@TESTDIR = test
-SUBDIRS = db htlib htword htcommon htnet htfuzzy htdb hldig hlsearch httools installdir include $(TESTDIR) po
-EXTRA_DIST = config.rpath m4/ChangeLog  .version Makefile.config contrib ABOUT-NLS
+
+# process the Makefile.am files in these directories. the po directory
+# is a little # different because of a rule near the end of configure.ac
+SUBDIRS = db htlib htword htcommon htnet htfuzzy htdb hldig hlsearch	\
+httools installdir include $(TESTDIR) po
+
+
+# files to be installed to destination docdir when 'make install' is run
+packextrasdir = @docdir@
+EXTRA_DIST = \
+.version	\
+COPYING	\
+INSTALL	\
+README.md	\
+AUTHORS.md	\
+TESTING.md	\
+CONTRIBUTING.md	\
+TRANSLATING.md \
+ChangeLog.md \
+STATUS	\
+CODE_OF_CONDUCT.md
+
+packextras_DATA = $(EXTRA_DIST)
+
+# This only install the html and gif files, but not the assets (css and images)
+# in the docs directory
+# packextraswebsitedir=@docdir@/docs
+
+# WEBSITE = \
+#	docs/*.html \
+#	docs/*.gif
+# packextraswebsite_DATA=$(WEBSITE)
 ACLOCAL_AMFLAGS = -I m4
 distdir = $(PACKAGE)-$(VERSION)
 all: all-recursive
@@ -462,6 +522,27 @@ clean-libtool:
 
 distclean-libtool:
 	-rm -f libtool config.lt
+install-packextrasDATA: $(packextras_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(packextras_DATA)'; test -n "$(packextrasdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(packextrasdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(packextrasdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(packextrasdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(packextrasdir)" || exit $$?; \
+	done
+
+uninstall-packextrasDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(packextras_DATA)'; test -n "$(packextrasdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(packextrasdir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run 'make' without going through this Makefile.
@@ -762,9 +843,12 @@ distcleancheck: distclean
 	       exit 1; } >&2
 check-am: all-am
 check: check-recursive
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
+	for dir in "$(DESTDIR)$(packextrasdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -817,7 +901,7 @@ info: info-recursive
 
 info-am:
 
-install-data-am:
+install-data-am: install-packextrasDATA
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
 install-dvi: install-dvi-recursive
@@ -864,7 +948,7 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am:
+uninstall-am: uninstall-packextrasDATA
 
 .MAKE: $(am__recursive_targets) install-am install-data-am \
 	install-strip
@@ -880,11 +964,12 @@ uninstall-am:
 	install-data install-data-am install-data-hook install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am tags tags-am uninstall uninstall-am
+	install-packextrasDATA install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-packextrasDATA
 
 .PRECIOUS: Makefile
 
@@ -909,6 +994,9 @@ install-data-hook:
 	@echo "Before you can start searching, you will need to create a"
 	@echo "search database.  A sample script to do this has been"
 	@echo "installed as " $(DESTDIR)$(bindir)/rundig
+	@echo ""
+	@echo "To uninstall hldig, use 'make uninstall' (must be run before 'make distclean')"
+	@echo "To remove build files, use 'make distclean'"
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

compile

@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2016-01-11.22; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
 # Written by Tom Tromey <[email protected]>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -255,7 +255,8 @@ EOF
     echo "compile $scriptversion"
     exit $?
     ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
     func_cl_wrapper "$@"      # Doesn't return...
     ;;
 esac
@@ -342,6 +343,6 @@ exit $ret
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:

config.guess

@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2016 Free Software Foundation, Inc.
+#   Copyright 1992-2017 Free Software Foundation, Inc.
 
-timestamp='2016-10-02'
+timestamp='2017-05-27'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2016 Free Software Foundation, Inc.
+Copyright 1992-2017 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -837,10 +837,11 @@ EOF
 	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	case ${UNAME_PROCESSOR} in
 	    amd64)
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    *)
-		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		UNAME_PROCESSOR=x86_64 ;;
+	    i386)
+		UNAME_PROCESSOR=i586 ;;
 	esac
+	echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
@@ -1303,14 +1304,21 @@ EOF
 	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
 	    if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
 		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		    (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-		    grep IS_64BIT_ARCH >/dev/null
+		       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		       grep IS_64BIT_ARCH >/dev/null
 		then
 		    case $UNAME_PROCESSOR in
 			i386) UNAME_PROCESSOR=x86_64 ;;
 			powerpc) UNAME_PROCESSOR=powerpc64 ;;
 		    esac
 		fi
+		# On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
+		if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
+		       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		       grep IS_PPC >/dev/null
+		then
+		    UNAME_PROCESSOR=powerpc
+		fi
 	    fi
 	elif test "$UNAME_PROCESSOR" = i386 ; then
 	    # Avoid executing cc on OS X 10.9, as it ships with a stub
@@ -1334,15 +1342,18 @@ EOF
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit ;;
-    NEO-?:NONSTOP_KERNEL:*:*)
+    NEO-*:NONSTOP_KERNEL:*:*)
 	echo neo-tandem-nsk${UNAME_RELEASE}
 	exit ;;
     NSE-*:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
+    NSR-*:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
 	exit ;;
+    NSX-*:NONSTOP_KERNEL:*:*)
+	echo nsx-tandem-nsk${UNAME_RELEASE}
+	exit ;;
     *:NonStop-UX:*:*)
 	echo mips-compaq-nonstopux
 	exit ;;