diff options
| author | Emmanuel Dreyfus <manu@netbsd.org> | 2015-04-16 19:28:21 +0200 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2015-04-20 04:29:26 -0700 |
| commit | 1fbcecb72ef3525823536b640d244d1e5127a37f (patch) | |
| tree | 9f028db0ff61ce4c262d0cc26992eeddbc5c5680 /extras | |
| parent | f45779067dbba3077b9c64c930fd4ddd1c51243e (diff) | |
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.
BUG: 1129939
Change-Id: I8caed4000f3c91cb3a685453848fb854793945ed
Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org>
Reviewed-on: http://review.gluster.org/10276
Tested-by: NetBSD Build System
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Diffstat (limited to 'extras')
| -rw-r--r-- | extras/Makefile.am | 4 | ||||
| -rw-r--r-- | extras/init.d/Makefile.am | 4 | ||||
| -rw-r--r-- | extras/systemd/Makefile.am | 2 |
3 files changed, 5 insertions, 5 deletions
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 |