From f7b8b1c95a11a8100b3bbb2a820dcead1b094655 Mon Sep 17 00:00:00 2001 From: Emmanuel Dreyfus Date: Fri, 17 Apr 2015 06:09:15 +0200 Subject: 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. Backport of I8caed4000f3c91cb3a685453848fb854793945ed BUG: 1138897 Change-Id: I48a24231ba90aa3e84bf433b63ae5cb50307f042 Signed-off-by: Emmanuel Dreyfus Reviewed-on: http://review.gluster.org/10278 Tested-by: Gluster Build System Reviewed-by: Kaleb KEITHLEY Reviewed-by: Raghavendra Bhat --- extras/Makefile.am | 2 +- extras/init.d/Makefile.am | 4 ++-- extras/systemd/Makefile.am | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'extras') diff --git a/extras/Makefile.am b/extras/Makefile.am index a163b1ae3a2..b3405552675 100644 --- a/extras/Makefile.am +++ b/extras/Makefile.am @@ -21,6 +21,6 @@ EXTRA_DIST = $(conf_DATA) specgen.scm glusterfs-mode.el glusterfs.vim \ command-completion/README install-data-local: - $(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 -- cgit