From: Rolf Eike Beer <eb@emlix.com>
Date: Mon, 10 Jul 2017 11:54:24 +0000 (+0200)
Subject: mkfs-ubifs: fix inclusion of uuid.h
X-Git-Tag: v2.0.1~3
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=454a3d0b1ac413de3c32e4076ba74fdc70a8e973;p=mtd-utils.git

mkfs-ubifs: fix inclusion of uuid.h

The include directory exported by uuid.pc is */include/uuid, so uuid.h
must be included without any directory in the path. This usually works
out because uuid is installed in the normal prefix, so the parent
directory of what uuid has as include dir ends up in the include path
anyway. In case one uses a custom uuid outside of the regular include
path this breaks.

Signed-off-by: Rolf Eike Beer <eb@emlix.com>
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
---

diff --git a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.h b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.h
index 944a159..1321191 100644
--- a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.h
+++ b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.h
@@ -43,7 +43,7 @@
 #include <errno.h>
 #include <libgen.h>
 #include <ctype.h>
-#include <uuid/uuid.h>
+#include <uuid.h>
 #include <sys/file.h>
 
 #include <mtd/ubifs-media.h>