--- a/ChangeLog	Fri Apr 08 04:42:49 2016 +0100
+++ b/ChangeLog	Fri Apr 08 17:53:04 2016 +0100
@@ -1,3 +1,12 @@
+2016-04-08  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR2873: Fix make distcheck
+	* Makefile.am:
+	(uninstall-local): Move removal of htmldir to
+	end and only do so if it still exists, as
+	docdir may equal htmldir. Always test with
+	-d to ensure the target is a directory for rmdir.
+
 2016-04-07  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	* NEWS: Set release date to current date.

--- a/Makefile.am	Fri Apr 08 04:42:49 2016 +0100
+++ b/Makefile.am	Fri Apr 08 17:53:04 2016 +0100
@@ -2875,11 +2875,10 @@
 	for items in $(BUILD_OUTPUT_DIR)/docs/*; do \
 	  rm -rvf $(DESTDIR)$(htmldir)/$$(basename $${items}); \
 	done
-	$(RMDIR) $(DESTDIR)$(htmldir)
 endif
 	for vms in client server ; do \
 	  rm -vf $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/$${vms}/classes.jsa; \
-	  if [ -e $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/$${vms} ] ; then \
+	  if [ -d $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/$${vms} ] ; then \
 	    $(RMDIR) $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/$${vms} ; \
 	  fi ; \
 	done
@@ -2903,6 +2902,12 @@
 	for sizes in 16 24 32 48 ; do \
 	  $(RMDIR) $(DESTDIR)$(datadir)/icons/hicolor/$${sizes}x$${sizes}/apps ; \
 	done
+if ENABLE_DOCS
+# May have already been removed if docdir == htmldir
+	if [ -d $(DESTDIR)$(htmldir) ] ; then \
+	  $(RMDIR) $(DESTDIR)$(htmldir) ; \
+	fi
+endif
 
 # Target Aliases
 # ===============