From: Karel Zak <kzak@redhat.com>
Date: Fri, 19 Jun 2020 17:04:10 +0000 (+0200)
Subject: build-sys: fix blkdiscard blkid.h use
X-Git-Tag: v2.36-rc2~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=883d1d65649e97877f4043e103c92d4271c280f2;p=thirdparty%2Futil-linux.git

build-sys: fix blkdiscard blkid.h use

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am
index b5f6c1b1b0..0443912e65 100644
--- a/sys-utils/Makemodule.am
+++ b/sys-utils/Makemodule.am
@@ -166,6 +166,7 @@ sbin_PROGRAMS += blkdiscard
 dist_man_MANS += sys-utils/blkdiscard.8
 blkdiscard_SOURCES = sys-utils/blkdiscard.c lib/monotonic.c
 blkdiscard_LDADD = $(LDADD) libblkid.la libcommon.la $(REALTIME_LIBS)
+blkdiscard_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
 endif
 
 if BUILD_BLKZONE
diff --git a/sys-utils/blkdiscard.c b/sys-utils/blkdiscard.c
index 2dd4638aa6..8abc425a8f 100644
--- a/sys-utils/blkdiscard.c
+++ b/sys-utils/blkdiscard.c
@@ -37,7 +37,7 @@
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <linux/fs.h>
-#include <blkid/blkid.h>
+#include <blkid.h>
 
 #include "nls.h"
 #include "strutils.h"