summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiels de Vos <ndevos@redhat.com>2015-11-09 13:04:03 +0100
committerNiels de Vos <ndevos@redhat.com>2015-11-10 00:57:44 -0800
commit4ac2ff18db62db192c49affd8591e846c810667a (patch)
tree4699af588c149d334e48124adcbbd607643d0110
parent066a45d76021bfda09bdb57108d677eae7eba92b (diff)
build: MKDIR_P is not defined for Makefiles, use mkdir_p instead
Change-Id: Id6d5263eb7b1c53e72a7668e716e9cc4e34b82cd Reported-by: Milind Changire <mchangir@redhat.com> BUG: 1198849 Signed-off-by: Niels de Vos <ndevos@redhat.com> Reviewed-on: http://review.gluster.org/12553 Tested-by: NetBSD Build System <jenkins@build.gluster.org> Reviewed-by: Milind Changire <mchangir@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com>
-rw-r--r--cli/src/Makefile.am2
-rw-r--r--extras/Makefile.am4
-rw-r--r--extras/init.d/Makefile.am4
-rw-r--r--extras/systemd/Makefile.am2
-rw-r--r--tools/glusterfind/Makefile.am4
-rw-r--r--xlators/mgmt/glusterd/src/Makefile.am2
6 files changed, 9 insertions, 9 deletions
diff --git a/cli/src/Makefile.am b/cli/src/Makefile.am
index 92cf35a581c..91819d111e3 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 76dbb36ab9e..609d497f5b8 100644
--- a/extras/Makefile.am
+++ b/extras/Makefile.am
@@ -26,10 +26,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 347545fe520..8c43e513d77 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 1fbb74593bb..3fc656b8262 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 514c37c14ad..17ff915834f 100644
--- a/tools/glusterfind/Makefile.am
+++ b/tools/glusterfind/Makefile.am
@@ -13,8 +13,8 @@ uninstall-local:
rm -f $(DESTDIR)$(GLUSTERD_WORKDIR)/hooks/1/delete/post/S57glusterfind-delete-post.py
install-data-local:
- $(MKDIR_P) $(DESTDIR)$(GLUSTERD_WORKDIR)/glusterfind/.keys
- $(MKDIR_P) $(DESTDIR)$(GLUSTERD_WORKDIR)/hooks/1/delete/post/
+ $(mkdir_p) $(DESTDIR)$(GLUSTERD_WORKDIR)/glusterfind/.keys
+ $(mkdir_p) $(DESTDIR)$(GLUSTERD_WORKDIR)/hooks/1/delete/post/
rm -f $(DESTDIR)$(GLUSTERD_WORKDIR)/hooks/1/delete/post/S57glusterfind-delete-post.py
ln -s $(libexecdir)/glusterfs/glusterfind/S57glusterfind-delete-post.py \
$(DESTDIR)$(GLUSTERD_WORKDIR)/hooks/1/delete/post/S57glusterfind-delete-post.py
diff --git a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am
index 7d41b71e3ed..8a414d5bcc0 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;