diff options
| author | Emmanuel Dreyfus <manu@netbsd.org> | 2015-04-17 06:09:15 +0200 |
|---|---|---|
| committer | Raghavendra Bhat <raghavendra@redhat.com> | 2015-05-19 06:23:59 -0700 |
| commit | f7b8b1c95a11a8100b3bbb2a820dcead1b094655 (patch) | |
| tree | f36849c9915b65684cbfea1c6e7fc8284d6ed2c8 | |
| parent | 690c87816d412cc2a6c6f735c1941810bcb700ea (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.
Backport of I8caed4000f3c91cb3a685453848fb854793945ed
BUG: 1138897
Change-Id: I48a24231ba90aa3e84bf433b63ae5cb50307f042
Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org>
Reviewed-on: http://review.gluster.org/10278
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Reviewed-by: Raghavendra Bhat <raghavendra@redhat.com>
| -rw-r--r-- | cli/src/Makefile.am | 2 | ||||
| -rw-r--r-- | extras/Makefile.am | 2 | ||||
| -rw-r--r-- | extras/init.d/Makefile.am | 4 | ||||
| -rw-r--r-- | extras/systemd/Makefile.am | 2 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/Makefile.am | 2 |
5 files changed, 6 insertions, 6 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 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 diff --git a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am index c149f64e546..7514eb4d914 100644 --- a/xlators/mgmt/glusterd/src/Makefile.am +++ b/xlators/mgmt/glusterd/src/Makefile.am @@ -42,7 +42,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; |