Merge branch 'aufs5.4/30stdalone' into aufs5.4/39public

02f0ce90 · J. R. Okajima · b31255c2 · edca3174 · 02f0ce90
Commit 02f0ce90 authored Jan 11, 2020 by J. R. Okajima
--- a/Makefile
+++ b/Makefile
@@ -42,10 +42,9 @@ fs/aufs/aufs.ko:
 	@echo ${EXTRA_CFLAGS}
 	${MAKE} ${MakeMod} modules
-usr/include/linux/aufs_type.h: d = $(shell echo ${CURDIR} | cut -c2-)
+usr/include/linux/aufs_type.h: ${KDIR}/scripts/headers_install.sh \
-usr/include/linux/aufs_type.h:
+				${CURDIR}/include/uapi/linux/aufs_type.h
-	${MAKE} -rR -C ${KDIR} \
+	${MAKE} -C ${KDIR} scripts_unifdef
-		-f scripts/Makefile.headersinst \
+	mkdir -p $(dir $@)
-		-f Makefile \
+	cd ${KDIR} && $^ ${CURDIR}/$@
-		obj=${d}/include/uapi/linux dst=${d}/usr/include/linux
 	test -s $@