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>

diff --git a/MCONFIG.in b/MCONFIG.in
index 6151825accd960dbb59e8c9422486600af17dc78..211c584744d0c7f65c2832c87d75473cac1d6c52 100644 (file)
--- 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 b951c0174cc3d3f15c3d7803cba8a0fc5a80ebd2..72e05d59ddc21248d8176f5466f0e74660e235fa 100644 (file)
--- 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 bb4d1947b33bc06abcb2e58a1dea4c69342f4ed6..afa5ba95518cdbe7634e5ece66420655a66efcae 100644 (file)
--- 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 dab60947e84d4536f32c1934e69b5009245191ff..a359453139a9d4afeb11ec9b93f708827820d438 100644 (file)
--- 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 3fdbfbd82f3b57163592c63679365fbc020d8b00..c81b9f0dac29013d886b6041600e12e941cb60a1 100644 (file)
--- 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 0697431ebf7ec6817300214596468d5ad6a6ae0f..e4724ca512e10ed1c96d2f9cdc13ec0fa11018c7 100644 (file)
--- 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 850d6882a94a720253e649fc689785853af8c836..c5ca9206f44f82b51ecc01dd79d3c6fb4a2c1b29 100644 (file)
--- 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 9e96884a0b502bd38aaf0d5ed0aa11d70afc0bc4..62816eac8f0c1ff67e48365c1e275350fade5a06 100644 (file)
--- 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 16e29ea45b6163e819586d5cfaab4fa18746c509..d411f231cf3ce4300f69d17d61c51ca1e47d51ab 100644 (file)
--- 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 f754b952fd19ba940e69b694b307b7dff9205d0d..2980522fa81e3d9c9ee6c58b06b5f37e153b2f1b 100644 (file)
--- 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 bf2989b1e09782932af4d79f50fefaf38a01003e..40294db0beb532ec8ac4c4a8107c6960cad1dbd7 100644 (file)
--- 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 1d278642ca4f531804c6dc766bd9958ebd1ca63f..f3c7981e4cf2669fa5720cda0037352ad5d53aaf 100644 (file)
--- 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 972459f8a7e055d924e6d0a2093fd1178babbb9e..5f69779251250cf95b8f1afa74cc052eca581c0d 100644 (file)
--- 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 9f2a8939db75d2829bca907b5b7f87f8b0bcbba9..e61e6b7f6b5059513f1bfe4b2aec6e9208ce73ec 100644 (file)
--- 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 f7f836a20e043b2eb7260825ed99c25dbe10e9a7..fdd0f2e66fc8923cbaf0fa8d2da3768f0edd965f 100644 (file)
--- 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 10c2f43e9a67790a8b8e0c4639b1425d1c5030b0..387f6504ab2c8488f8b35df39de48fd2ffc55320 100644 (file)
--- 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 d9f8c731f7ed28a9b48c757de469265991b0e5a0..ba06b3b6b91f58a0ee5167c6e80cd3d949e409bd 100644 (file)
--- 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 b0ed853f82bb59eb92c68a9ec0f76fe6ada879ba..e1325c619aef89db700565636ee72c0752e82856 100644 (file)
--- 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 a3df17e4585799e3d712147b99d850f9d92d3da6..7ad18c0aa0b5088f8eebf7d99b465546eea9131c 100644 (file)
--- 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