diff options
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | libblkid/src/Makemodule.am | 2 | ||||
-rw-r--r-- | libfdisk/src/Makemodule.am | 2 | ||||
-rw-r--r-- | libmount/src/Makemodule.am | 2 | ||||
-rw-r--r-- | libsmartcols/src/Makemodule.am | 2 | ||||
-rw-r--r-- | libuuid/src/Makemodule.am | 2 | ||||
-rw-r--r-- | sys-utils/Makemodule.am | 2 |
8 files changed, 8 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index f5322b3da..3a8f471be 100644 --- a/Makefile.am +++ b/Makefile.am @@ -144,7 +144,7 @@ EXTRA_DIST += $(PATHFILES:=.in) $(PATHFILES): Makefile @ rm -f $@ $@.tmp - $(AM_V_at) test -d $(dir $@) || mkdir -p $(dir $@) + $(AM_V_at) $(MKDIR_P) $$(dirname $@) $(AM_V_GEN) srcdir=''; \ test -f ./$@.in || srcdir=$(srcdir)/; \ $(edit_cmd) $${srcdir}$@.in >$@.tmp diff --git a/configure.ac b/configure.ac index bfb12cade..5e89e3b57 100644 --- a/configure.ac +++ b/configure.ac @@ -99,6 +99,7 @@ AC_SUBST([usrlib_execdir]) AM_PROG_CC_C_O +AC_PROG_MKDIR_P AC_PROG_CC_STDC AC_CANONICAL_HOST AC_C_CONST diff --git a/libblkid/src/Makemodule.am b/libblkid/src/Makemodule.am index 7839813ea..1fa00e982 100644 --- a/libblkid/src/Makemodule.am +++ b/libblkid/src/Makemodule.am @@ -224,7 +224,7 @@ endif # BUILD_LIBBLKID_TESTS # move lib from $(usrlib_execdir) to $(libdir) if needed install-exec-hook-libblkid: if test "$(usrlib_execdir)" != "$(libdir)" -a -f "$(DESTDIR)$(usrlib_execdir)/libblkid.so"; then \ - mkdir -p $(DESTDIR)$(libdir); \ + $(MKDIR_P) $(DESTDIR)$(libdir); \ mv $(DESTDIR)$(usrlib_execdir)/libblkid.so.* $(DESTDIR)$(libdir); \ so_img_name=$$(readlink $(DESTDIR)$(usrlib_execdir)/libblkid.so); \ so_img_rel_target=$$(echo $(usrlib_execdir) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ diff --git a/libfdisk/src/Makemodule.am b/libfdisk/src/Makemodule.am index 3516d1251..bc7f1a378 100644 --- a/libfdisk/src/Makemodule.am +++ b/libfdisk/src/Makemodule.am @@ -111,7 +111,7 @@ endif # BUILD_LIBFDISK_TESTS # move lib from $(usrlib_execdir) to $(libdir) if needed install-exec-hook-libfdisk: if test "$(usrlib_execdir)" != "$(libdir)" -a -f "$(DESTDIR)$(usrlib_execdir)/libfdisk.so"; then \ - mkdir -p $(DESTDIR)$(libdir); \ + $(MKDIR_P) $(DESTDIR)$(libdir); \ mv $(DESTDIR)$(usrlib_execdir)/libfdisk.so.* $(DESTDIR)$(libdir); \ so_img_name=$$(readlink $(DESTDIR)$(usrlib_execdir)/libfdisk.so); \ so_img_rel_target=$$(echo $(usrlib_execdir) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ diff --git a/libmount/src/Makemodule.am b/libmount/src/Makemodule.am index 40a05c633..fd007a4f9 100644 --- a/libmount/src/Makemodule.am +++ b/libmount/src/Makemodule.am @@ -154,7 +154,7 @@ endif # BUILD_LIBMOUNT_TESTS # move lib from $(usrlib_execdir) to $(libdir) if needed install-exec-hook-libmount: if test "$(usrlib_execdir)" != "$(libdir)" -a -f "$(DESTDIR)$(usrlib_execdir)/libmount.so"; then \ - mkdir -p $(DESTDIR)$(libdir); \ + $(MKDIR_P) $(DESTDIR)$(libdir); \ mv $(DESTDIR)$(usrlib_execdir)/libmount.so.* $(DESTDIR)$(libdir); \ so_img_name=$$(readlink $(DESTDIR)$(usrlib_execdir)/libmount.so); \ so_img_rel_target=$$(echo $(usrlib_execdir) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ diff --git a/libsmartcols/src/Makemodule.am b/libsmartcols/src/Makemodule.am index 3f814d280..83c12ca54 100644 --- a/libsmartcols/src/Makemodule.am +++ b/libsmartcols/src/Makemodule.am @@ -48,7 +48,7 @@ EXTRA_DIST += \ # move lib from $(usrlib_execdir) to $(libdir) if needed install-exec-hook-libsmartcols: if test "$(usrlib_execdir)" != "$(libdir)" -a -f "$(DESTDIR)$(usrlib_execdir)/libsmartcols.so"; then \ - mkdir -p $(DESTDIR)$(libdir); \ + $(MKDIR_P) $(DESTDIR)$(libdir); \ mv $(DESTDIR)$(usrlib_execdir)/libsmartcols.so.* $(DESTDIR)$(libdir); \ so_img_name=$$(readlink $(DESTDIR)$(usrlib_execdir)/libsmartcols.so); \ so_img_rel_target=$$(echo $(usrlib_execdir) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ diff --git a/libuuid/src/Makemodule.am b/libuuid/src/Makemodule.am index 2e17677cc..d3fc81128 100644 --- a/libuuid/src/Makemodule.am +++ b/libuuid/src/Makemodule.am @@ -48,7 +48,7 @@ EXTRA_DIST += libuuid/src/libuuid.sym # move lib from $(usrlib_execdir) to $(libdir) if needed install-exec-hook-libuuid: if test "$(usrlib_execdir)" != "$(libdir)" -a -f "$(DESTDIR)$(usrlib_execdir)/libuuid.so"; then \ - mkdir -p $(DESTDIR)$(libdir); \ + $(MKDIR_P) $(DESTDIR)$(libdir); \ mv $(DESTDIR)$(usrlib_execdir)/libuuid.so.* $(DESTDIR)$(libdir); \ so_img_name=$$(readlink $(DESTDIR)$(usrlib_execdir)/libuuid.so); \ so_img_rel_target=$$(echo $(usrlib_execdir) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am index c62d77c79..ad60360db 100644 --- a/sys-utils/Makemodule.am +++ b/sys-utils/Makemodule.am @@ -163,7 +163,7 @@ man_MANS += $(SETARCH_MAN_LINKS) CLEANFILES += $(SETARCH_MAN_LINKS) $(SETARCH_MAN_LINKS): - $(AM_V_at) test -d $(dir $@) || mkdir -p $(dir $@) + $(AM_V_at) $(MKDIR_P) sys-utils $(AM_V_GEN)echo ".so man8/setarch.8" > $@ install-exec-hook-setarch: |