Define MKDIR_P in the Makefile.in files instead in MCONFIG.in

In the case where mkdir -p is not thread-safe (for example, if the
build environment is using busybox's mkdir) the configure script will
fall back to the slow (but safe) install-sh script.  In that case
MKDIR_P will be using a relative pathname; so we can't use speed
optimization of defining configure substitutions in MCONFIG.in, since
the substitution will be different depending on depth of the
subdirectory in the Makefile.in file.

https://github.com/tytso/e2fsprogs/issues/51

Signed-off-by: Theodore Ts'o <tytso@mit.edu>

19 files changed, 18 insertions, 1 deletions

diff --git a/MCONFIG.in b/MCONFIG.in
index 6151825ac..211c58474 100644
--- a/MCONFIG.in
+++ b/MCONFIG.in
@@ -121,7 +121,6 @@ LDCONFIG = @LDCONFIG@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-MKDIR_P = @MKDIR_P@
 
 #
 # Library definitions
diff --git a/Makefile.in b/Makefile.in
index b951c0174..72e05d59d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,6 +4,7 @@ VPATH = @srcdir@
 top_builddir = .
 my_dir = .
 INSTALL = @INSTALL@
+MKDIR_P = @MKDIR_P@
 
 @MCONFIG@
 
diff --git a/debugfs/Makefile.in b/debugfs/Makefile.in
index bb4d1947b..afa5ba955 100644
--- a/debugfs/Makefile.in
+++ b/debugfs/Makefile.in
@@ -8,6 +8,7 @@ VPATH = @srcdir@
 top_builddir = ..
 my_dir = debugfs
 INSTALL = @INSTALL@
+MKDIR_P = @MKDIR_P@
 
 @MCONFIG@
 
diff --git a/doc/Makefile.in b/doc/Makefile.in
index dab60947e..a35945313 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -8,6 +8,7 @@ VPATH = @srcdir@
 top_builddir = ..
 my_dir = doc
 INSTALL = @INSTALL@
+MKDIR_P = @MKDIR_P@
 
 @MCONFIG@
 
diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in
index 3fdbfbd82..c81b9f0da 100644
--- a/e2fsck/Makefile.in
+++ b/e2fsck/Makefile.in
@@ -8,6 +8,7 @@ VPATH = @srcdir@
 top_builddir = ..
 my_dir = e2fsck
 INSTALL = @INSTALL@
+MKDIR_P = @MKDIR_P@
 
 @MCONFIG@
 
diff --git a/ext2ed/Makefile.in b/ext2ed/Makefile.in
index 0697431eb..e4724ca51 100644
--- a/ext2ed/Makefile.in
+++ b/ext2ed/Makefile.in
@@ -8,6 +8,7 @@ VPATH = @srcdir@
 top_builddir = ..
 my_dir = ext2ed
 INSTALL = @INSTALL@
+MKDIR_P = @MKDIR_P@
 
 @MCONFIG@
 
diff --git a/lib/blkid/Makefile.in b/lib/blkid/Makefile.in
index 850d6882a..c5ca9206f 100644
--- a/lib/blkid/Makefile.in
+++ b/lib/blkid/Makefile.in
@@ -11,6 +11,7 @@ VPATH = @srcdir@
 top_builddir = ../..
 my_dir = lib/blkid
 INSTALL = @INSTALL@
+MKDIR_P = @MKDIR_P@
 
 @MCONFIG@
 
diff --git a/lib/e2p/Makefile.in b/lib/e2p/Makefile.in
index 9e96884a0..62816eac8 100644
--- a/lib/e2p/Makefile.in
+++ b/lib/e2p/Makefile.in
@@ -11,6 +11,7 @@ VPATH = @srcdir@
 top_builddir = ../..
 my_dir = lib/e2p
 INSTALL = @INSTALL@
+MKDIR_P = @MKDIR_P@
 
 @MCONFIG@
 
diff --git a/lib/et/Makefile.in b/lib/et/Makefile.in
index 16e29ea45..d411f231c 100644
--- a/lib/et/Makefile.in
+++ b/lib/et/Makefile.in
@@ -8,6 +8,7 @@ VPATH = @srcdir@
 top_builddir = ../..
 my_dir = lib/et
 INSTALL = @INSTALL@
+MKDIR_P = @MKDIR_P@
 
 DEP_MAKEFILE = $(DEP_LIB_MAKEFILES)
 
diff --git a/lib/ext2fs/Makefile.in b/lib/ext2fs/Makefile.in
index f754b952f..2980522fa 100644
--- a/lib/ext2fs/Makefile.in
+++ b/lib/ext2fs/Makefile.in
@@ -4,6 +4,7 @@ VPATH = @srcdir@
 top_builddir = ../..
 my_dir = lib/ext2fs
 INSTALL = @INSTALL@
+MKDIR_P = @MKDIR_P@
 DEPEND_CFLAGS = -I$(top_srcdir)/debugfs -I$(srcdir)/../../e2fsck -DDEBUGFS
 # This nastiness is needed because of jfs_user.h hackery; when we finally
 # clean up this mess, we should be able to drop it
diff --git a/lib/ss/Makefile.in b/lib/ss/Makefile.in
index bf2989b1e..40294db0b 100644
--- a/lib/ss/Makefile.in
+++ b/lib/ss/Makefile.in
@@ -8,6 +8,7 @@ VPATH = @srcdir@
 top_builddir = ../..
 my_dir = lib/ss
 INSTALL = @INSTALL@
+MKDIR_P = @MKDIR_P@
 DLOPEN_LIB = @DLOPEN_LIB@
 
 @MCONFIG@
diff --git a/lib/support/Makefile.in b/lib/support/Makefile.in
index 1d278642c..f3c7981e4 100644
--- a/lib/support/Makefile.in
+++ b/lib/support/Makefile.in
@@ -7,6 +7,7 @@ VPATH = @srcdir@
 top_builddir = ../..
 my_dir = lib/support
 INSTALL = @INSTALL@
+MKDIR_P = @MKDIR_P@
 
 @MCONFIG@
 
diff --git a/lib/uuid/Makefile.in b/lib/uuid/Makefile.in
index 972459f8a..5f6977925 100644
--- a/lib/uuid/Makefile.in
+++ b/lib/uuid/Makefile.in
@@ -7,6 +7,7 @@ VPATH = @srcdir@
 top_builddir = ../..
 my_dir = lib/uuid
 INSTALL = @INSTALL@
+MKDIR_P = @MKDIR_P@
 
 @MCONFIG@
 
diff --git a/misc/Makefile.in b/misc/Makefile.in
index 9f2a8939d..e61e6b7f6 100644
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -8,6 +8,7 @@ VPATH = @srcdir@
 top_builddir = ..
 my_dir = misc
 INSTALL = @INSTALL@
+MKDIR_P = @MKDIR_P@
 
 @MCONFIG@
 
diff --git a/resize/Makefile.in b/resize/Makefile.in
index f7f836a20..fdd0f2e66 100644
--- a/resize/Makefile.in
+++ b/resize/Makefile.in
@@ -8,6 +8,7 @@ VPATH = @srcdir@
 top_builddir = ..
 my_dir = resize
 INSTALL = @INSTALL@
+MKDIR_P = @MKDIR_P@
 
 @MCONFIG@
 
diff --git a/scrub/Makefile.in b/scrub/Makefile.in
index 10c2f43e9..387f6504a 100644
--- a/scrub/Makefile.in
+++ b/scrub/Makefile.in
@@ -8,6 +8,7 @@ VPATH = @srcdir@
 top_builddir = ..
 my_dir = scrub
 INSTALL = @INSTALL@
+MKDIR_P = @MKDIR_P@
 
 @MCONFIG@
 
diff --git a/tests/Makefile.in b/tests/Makefile.in
index d9f8c731f..ba06b3b6b 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -8,6 +8,7 @@ VPATH = @srcdir@
 top_builddir = ..
 my_dir = tests
 INSTALL = @INSTALL@
+MKDIR_P = @MKDIR_P@
 
 @MCONFIG@
 
diff --git a/tests/progs/Makefile.in b/tests/progs/Makefile.in
index b0ed853f8..e1325c619 100644
--- a/tests/progs/Makefile.in
+++ b/tests/progs/Makefile.in
@@ -8,6 +8,7 @@ VPATH = @srcdir@
 top_builddir = ../..
 my_dir = tests/progs
 INSTALL = @INSTALL@
+MKDIR_P = @MKDIR_P@
 
 @MCONFIG@
 
diff --git a/util/Makefile.in b/util/Makefile.in
index a3df17e45..7ad18c0aa 100644
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -8,6 +8,7 @@ VPATH = @srcdir@
 top_builddir = ..
 my_dir = util
 INSTALL = @INSTALL@
+MKDIR_P = @MKDIR_P@
 
 SRCS = $(srcdir)/subst.c $(srcdir)/mkutf8data.c