1From d24abbec201975a5eb7f8589614cfb424b8c80b6 Mon Sep 17 00:00:00 2001
2From: Alex Kaplan <kaplan2539@gmail.com>
3Date: Sat, 10 Nov 2018 19:50:51 -0800
4Subject: [PATCH] Fix makefiles for out-of-tree ext4_utils build
5
6Signed-off-by: Alex Kaplan <kaplan2539@gmail.com>
7---
8 debian/makefiles/ext4_utils.mk | 10 +++++-----
9 1 file changed, 5 insertions(+), 5 deletions(-)
10
11diff --git a/debian/makefiles/ext4_utils.mk b/debian/makefiles/ext4_utils.mk
12index cb64916..c5904bf 100644
13--- a/debian/makefiles/ext4_utils.mk
14+++ b/debian/makefiles/ext4_utils.mk
15@@ -1,6 +1,7 @@
16 # Makefile for ext4_utils; based on https://heiher.info/2227.html
17 # Author: Dmitrijs Ledkovs <xnox@ubuntu.com>
18
19+VPATH+=$(SRCDIR)/extras/ext4_utils
20 SRCS+=make_ext4fs.c
21 SRCS+=ext4fixup.c
22 SRCS+=ext4_utils.c
23@@ -13,7 +14,7 @@ SRCS+=sha1.c
24 SRCS+=wipe.c
25 SRCS+=crc16.c
26
27-VPATH+=../../core/libsparse
28+VPATH+=$(SRCDIR)/core/libsparse
29 SRCS+= backed_block.c
30 SRCS+= sparse_crc32.c
31 SRCS+= sparse.c
32@@ -31,10 +32,9 @@ SRCS+=img2simg.c
33 SRCS+=simg2img.c
34 SRCS+=simg2simg.c
35
36-CPPFLAGS+= -I.
37-CPPFLAGS+= -I/usr/include
38-CPPFLAGS+= -I../../core/include
39-CPPFLAGS+= -I../../core/libsparse/include/
40+CPPFLAGS+= -I$(SRCDIR)
41+CPPFLAGS+= -I$(SRCDIR)/core/include
42+CPPFLAGS+= -I$(SRCDIR)/core/libsparse/include/
43
44 LIBS+= -lz -lselinux
45
46--
472.7.4
48
49