Fix case mistake for MKDIR_P in Makefiles

Some makefiles used $(mkdir_p) instead of the corectly defined $(MKDIR_P).
The former is substituted as an empty string, leading to possible failures
depending of the user shell tolerance. NetBSD's /bin/sh seems to choke
more easily than Linux's /bin/bash, but if the later does not fail, it
does not created the intended directories anyway.

Resubmit after rebase in hope that regression test will have less
spurious failures.

Backport of: I8caed4000f3c91cb3a685453848fb854793945ed

BUG: 1212676
Change-Id: I393ffda8aa24bffce86f7b1f19b999ffa30c3562
Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org>
Reviewed-on: http://review.gluster.org/10279
Tested-by: NetBSD Build System
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>

6 files changed, 8 insertions, 8 deletions

diff --git a/cli/src/Makefile.am b/cli/src/Makefile.am
index 434122b2a78..db1d089b8f9 100644
--- a/cli/src/Makefile.am
+++ b/cli/src/Makefile.am
@@ -29,4 +29,4 @@ $(top_builddir)/libglusterfs/src/libglusterfs.la:
 	$(MAKE) -C $(top_builddir)/libglusterfs/src/ all
 
 install-data-hook:
-	$(mkdir_p) $(DESTDIR)$(localstatedir)/run/gluster
+	$(MKDIR_P) $(DESTDIR)$(localstatedir)/run/gluster
diff --git a/extras/Makefile.am b/extras/Makefile.am
index 1b66708fd90..888c12ec38a 100644
--- a/extras/Makefile.am
+++ b/extras/Makefile.am
@@ -25,10 +25,10 @@ EXTRA_DIST = $(conf_DATA) specgen.scm glusterfs-mode.el glusterfs.vim \
 
 install-data-local:
 	if [ -n "$(tmpfilesdir)" ]; then \
-		$(mkdir_p) $(DESTDIR)$(tmpfilesdir); \
+		$(MKDIR_P) $(DESTDIR)$(tmpfilesdir); \
 		$(INSTALL_DATA) run-gluster.tmpfiles \
 			$(DESTDIR)$(tmpfilesdir)/gluster.conf; \
 	fi
-	$(mkdir_p) $(DESTDIR)$(GLUSTERD_WORKDIR)/groups
+	$(MKDIR_P) $(DESTDIR)$(GLUSTERD_WORKDIR)/groups
 	$(INSTALL_DATA) $(top_srcdir)/extras/group-virt.example \
 		$(DESTDIR)$(GLUSTERD_WORKDIR)/groups/virt
diff --git a/extras/init.d/Makefile.am b/extras/init.d/Makefile.am
index 8c43e513d77..347545fe520 100644
--- a/extras/init.d/Makefile.am
+++ b/extras/init.d/Makefile.am
@@ -9,7 +9,7 @@ LAUNCHD_DIR = @launchddir@
 
 $(GF_DISTRIBUTION):
 	@if [ ! -d $(SYSTEMD_DIR) ]; then \
-		$(mkdir_p) $(DESTDIR)$(INIT_DIR); \
+		$(MKDIR_P) $(DESTDIR)$(INIT_DIR); \
 		$(INSTALL_PROGRAM) glusterd-$(GF_DISTRIBUTION) $(DESTDIR)$(INIT_DIR)/glusterd; \
 	fi
 
@@ -17,6 +17,6 @@ install-exec-local: $(GF_DISTRIBUTION)
 
 install-data-local:
 if GF_DARWIN_HOST_OS
-	$(mkdir_p) $(DESTDIR)$(LAUNCHD_DIR)
+	$(MKDIR_P) $(DESTDIR)$(LAUNCHD_DIR)
 	$(INSTALL_PROGRAM) glusterd.plist $(DESTDIR)$(LAUNCHD_DIR)/org.gluster.glusterd.plist
 endif
diff --git a/extras/systemd/Makefile.am b/extras/systemd/Makefile.am
index 3fc656b8262..1fbb74593bb 100644
--- a/extras/systemd/Makefile.am
+++ b/extras/systemd/Makefile.am
@@ -5,7 +5,7 @@ SYSTEMD_DIR = @systemddir@
 
 install-exec-local:
 	@if [ -d $(SYSTEMD_DIR) ]; then \
-		$(mkdir_p) $(DESTDIR)$(SYSTEMD_DIR); \
+		$(MKDIR_P) $(DESTDIR)$(SYSTEMD_DIR); \
 		$(INSTALL_PROGRAM) glusterd.service $(DESTDIR)$(SYSTEMD_DIR)/; \
 	fi
 
diff --git a/tools/glusterfind/Makefile.am b/tools/glusterfind/Makefile.am
index 872fff12047..c5a05d61061 100644
--- a/tools/glusterfind/Makefile.am
+++ b/tools/glusterfind/Makefile.am
@@ -7,4 +7,4 @@ bin_SCRIPTS = glusterfind
 CLEANFILES = $(bin_SCRIPTS)
 
 install-data-local:
-	$(mkdir_p) $(DESTDIR)$(GLUSTERD_WORKDIR)/glusterfind/.keys
+	$(MKDIR_P) $(DESTDIR)$(GLUSTERD_WORKDIR)/glusterfind/.keys
diff --git a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am
index 4793f31a034..74198271f48 100644
--- a/xlators/mgmt/glusterd/src/Makefile.am
+++ b/xlators/mgmt/glusterd/src/Makefile.am
@@ -60,7 +60,7 @@ CLEANFILES =
 
 install-data-hook:
 if GF_INSTALL_GLUSTERD_WORKDIR
-	$(mkdir_p) $(DESTDIR)$(GLUSTERD_WORKDIR)
+	$(MKDIR_P) $(DESTDIR)$(GLUSTERD_WORKDIR)
 	(stat $(DESTDIR)$(sysconfdir)/glusterd && \
 	    mv $(DESTDIR)$(sysconfdir)/glusterd $(DESTDIR)$(GLUSTERD_WORKDIR)) || true;
 	(ln -sf $(DESTDIR)$(GLUSTERD_WORKDIR) $(sysconfdir)/glusterd) || true;