shared: clean up mkdir.h/label.h situation

Previously the mkdir_label() family of calls was implemented in
src/shared/mkdir-label.c but its functions partly declared ins
src/shared/label.h and partly in src/basic/mkdir.h (!!). That's weird
(and wrong).

Let's clean this up, and add a proper mkdir-label.h matching the .c
file.

6 files changed, 6 insertions, 6 deletions

diff --git a/src/import/import-fs.c b/src/import/import-fs.c
index cacd48fe96..ff7f51a60a 100644
--- a/src/import/import-fs.c
+++ b/src/import/import-fs.c
@@ -14,7 +14,7 @@
 #include "import-util.h"
 #include "install-file.h"
 #include "main-func.h"
-#include "mkdir.h"
+#include "mkdir-label.h"
 #include "parse-argument.h"
 #include "ratelimit.h"
 #include "rm-rf.h"
diff --git a/src/import/import-raw.c b/src/import/import-raw.c
index 153b74d123..a0208e505c 100644
--- a/src/import/import-raw.c
+++ b/src/import/import-raw.c
@@ -18,7 +18,7 @@
 #include "install-file.h"
 #include "io-util.h"
 #include "machine-pool.h"
-#include "mkdir.h"
+#include "mkdir-label.h"
 #include "path-util.h"
 #include "qcow2-util.h"
 #include "ratelimit.h"
diff --git a/src/import/import-tar.c b/src/import/import-tar.c
index 8cbdbaa35f..f31d3d75a1 100644
--- a/src/import/import-tar.c
+++ b/src/import/import-tar.c
@@ -18,7 +18,7 @@
 #include "install-file.h"
 #include "io-util.h"
 #include "machine-pool.h"
-#include "mkdir.h"
+#include "mkdir-label.h"
 #include "path-util.h"
 #include "process-util.h"
 #include "qcow2-util.h"
diff --git a/src/import/importd.c b/src/import/importd.c
index 0400d41b14..66771f63e2 100644
--- a/src/import/importd.c
+++ b/src/import/importd.c
@@ -19,7 +19,7 @@
 #include "machine-pool.h"
 #include "main-func.h"
 #include "missing_capability.h"
-#include "mkdir.h"
+#include "mkdir-label.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "percent-util.h"
diff --git a/src/import/pull-raw.c b/src/import/pull-raw.c
index 6a0c2c8b17..0623afcc84 100644
--- a/src/import/pull-raw.c
+++ b/src/import/pull-raw.c
@@ -17,7 +17,7 @@
 #include "import-util.h"
 #include "install-file.h"
 #include "macro.h"
-#include "mkdir.h"
+#include "mkdir-label.h"
 #include "path-util.h"
 #include "pull-common.h"
 #include "pull-job.h"
diff --git a/src/import/pull-tar.c b/src/import/pull-tar.c
index 9608129e5e..fd866fc514 100644
--- a/src/import/pull-tar.c
+++ b/src/import/pull-tar.c
@@ -16,7 +16,7 @@
 #include "import-util.h"
 #include "install-file.h"
 #include "macro.h"
-#include "mkdir.h"
+#include "mkdir-label.h"
 #include "path-util.h"
 #include "process-util.h"
 #include "pull-common.h"