From: Ralph Corderoy <ralph@inputplus.co.uk>
Date: Thu, 17 Aug 2017 10:59:38 +0000 (+0100)
Subject: Makefile.am: Remove multiple `mkdir -p' for etc;  use ./configure.
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/1009a32da2ba2b0caae7b71708625e00d8cf58c6?ds=sidebyside;hp=ac0bb0e1e19bedfd9d7105db0aad1cdfc5ef994f

Makefile.am: Remove multiple `mkdir -p' for etc;  use ./configure.

A `mkdir -p' was used in each rule that created a file in etc to ensure
the directory already existed.  Ken pointed out existing ./configure
code to do that for the man directory, just once.  Use that for etc too.
Remove the `test -d' because `mkdir -p' does that itself.
---

diff --git a/Makefile.am b/Makefile.am
index 4f6627e4..5b975fd1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -871,7 +871,6 @@ config/version.c: Makefile $(srcdir)/config/version.sh
 	env srcdir="$(srcdir)" sh $(srcdir)/config/version.sh $(VERSION) > ./config/version.c
 
 etc/bash_completion_nmh: $(srcdir)/etc/bash_completion_nmh-gen
-	$(MKDIR_P) $(@D) # FIXME: A better way?
 	$(srcdir)/etc/bash_completion_nmh-gen > $@
 
 etc/mts.conf: $(srcdir)/etc/mts.conf.in Makefile
@@ -884,7 +883,6 @@ etc/mts.conf: $(srcdir)/etc/mts.conf.in Makefile
 				< $(srcdir)/etc/mts.conf.in > $@
 
 etc/mhn.defaults: $(srcdir)/etc/mhn.defaults.sh $(MHNSEARCHPROG)
-	$(MKDIR_P) $(@D) # FIXME: A better way?
 	@rm -f $@
 	$(srcdir)/etc/mhn.defaults.sh $(MHNSEARCHPATH) $(MHNSEARCHPROG) > $@
 
diff --git a/configure.ac b/configure.ac
index f41c7140..f0a8183d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -604,7 +604,7 @@ dnl exist.
 dnl
 
 AC_CONFIG_COMMANDS([build-directories],
-[test -d man || AS_MKDIR_P([man])])
+[AS_MKDIR_P([etc]); AS_MKDIR_P([man])])
 
 AC_CONFIG_COMMANDS_POST([