--- a/libinterp/module.mk	Wed Jun 22 01:47:05 2016 -0400
+++ b/libinterp/module.mk	Wed Jun 22 13:47:38 2016 -0400
@@ -258,8 +258,6 @@
 	mv $@-t $@
 endif
 
-if AMCOND_BUILD_DOCS
-
 DOCSTRING_FILES += $(srcdir)/libinterp/DOCSTRINGS
 
 $(srcdir)/libinterp/DOCSTRINGS: $(ALL_DEFUN_FILES) | libinterp/$(octave-dirstamp)
@@ -267,17 +265,11 @@
 	$(PERL) $(srcdir)/libinterp/gendoc.pl "$(srcdir)" $(ALL_DEFUN_FILES) > libinterp/DOCSTRINGS-t && \
 	mv libinterp/DOCSTRINGS-t $@
 
-endif
-
 OCTAVE_INTERPRETER_TARGETS += \
   $(OCT_FILES) \
   $(DLDFCN_PKG_ADD_FILE)
 
-if AMCOND_BUILD_DOCS
 install-data-hook: install-oct install-built-in-docstrings
-else
-install-data-hook: install-oct uninstall-built-in-docstrings
-endif
 
 uninstall-local: uninstall-oct uninstall-built-in-docstrings
 
@@ -311,15 +303,14 @@
 endif
 .PHONY: install-oct uninstall-oct
 
-if AMCOND_BUILD_DOCS
 install-built-in-docstrings:
 	$(MKDIR_P) $(DESTDIR)$(octetcdir)
 	$(INSTALL_DATA) $(srcdir)/libinterp/DOCSTRINGS $(DESTDIR)$(octetcdir)/built-in-docstrings
+.PHONY: install-built-in-docstrings
 
 uninstall-built-in-docstrings:
 	rm -f $(DESTDIR)$(octetcdir)/built-in-docstrings
-endif
-.PHONY: install-built-in-docstrings uninstall-built-in-docstrings
+.PHONY: uninstall-built-in-docstrings
 
 EXTRA_DIST += $(libinterp_EXTRA_DIST)
 

--- a/scripts/module.mk	Wed Jun 22 01:47:05 2016 -0400
+++ b/scripts/module.mk	Wed Jun 22 13:47:38 2016 -0400
@@ -104,8 +104,6 @@
 
 $(foreach f, $(GEN_FCN_FILES), $(eval $(call GEN_FCN_FILES_TEMPLATE, $(f))))
 
-if AMCOND_BUILD_DOCS
-
 DOCSTRING_FILES += $(srcdir)/scripts/DOCSTRINGS
 
 $(srcdir)/scripts/DOCSTRINGS: $(FCN_FILES) $(GEN_FCN_FILES_IN) | scripts/$(octave-dirstamp)
@@ -113,8 +111,6 @@
 	$(PERL) $(srcdir)/scripts/mkdoc.pl "$(srcdir)" $(FCN_FILES) $(GEN_FCN_FILES_IN) > scripts/DOCSTRINGS-t && \
 	mv scripts/DOCSTRINGS-t $@
 
-endif
-
 check-m-sources:
 	@echo "checking whether files in source tree are listed in module.mk files..."; \
 	for f in $$(find $(srcdir)/scripts -name '*.m'); do \