btrfs-progs: adjust install-static patch to install headers under $(prefix)/include...

Fixes:
http://autobuild.buildroot.net/results/15cc6523a42bf66508b2b37fd1fcb74625561ec2/

btrfs-progs 'make install' installs headers under $(prefix)/include/btrfs,
but our patch to also install headers for 'install-static' installed
directly into $(prefix)/include, confusing other packages as btrfs-progs
headers have very common names such as version, sizes.h, list.h, ioctl.h, ..

Fix it by adjusting the patch to also install under $(prefix)/include/btrfs.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

diff --git a/package/btrfs-progs/0001-Makefile-install-static-library-and-headers-in-insta.patch b/package/btrfs-progs/0001-Makefile-install-static-library-and-headers-in-insta.patch
index 1cdedfd984289589c27d695e630bccbc07e82b3b..de2db2f16fbe753250120b2026bc066422d53e14 100644 (file)
--- a/package/btrfs-progs/0001-Makefile-install-static-library-and-headers-in-insta.patch
+++ b/package/btrfs-progs/0001-Makefile-install-static-library-and-headers-in-insta.patch
@@ -41,8 +41,8 @@ index 67fbc48..d9e34be 100644
        $(LN_S) -f btrfs.static $(DESTDIR)$(bindir)/btrfsck.static
 +      $(INSTALL) -m755 -d $(DESTDIR)$(libdir)
 +      $(INSTALL) $(libs_static) $(DESTDIR)$(libdir)
-+      $(INSTALL) -m755 -d $(DESTDIR)$(incdir)
-+      $(INSTALL) -m644 $(libbtrfs_headers) $(DESTDIR)$(incdir)
++      $(INSTALL) -m755 -d $(DESTDIR)$(incdir)/btrfs
++      $(INSTALL) -m644 $(libbtrfs_headers) $(DESTDIR)$(incdir)/btrfs
  
  $(INSTALLDIRS):
        @echo "Making install in $(patsubst install-%,%,$@)"