aboutsummaryrefslogtreecommitdiffstats
path: root/tools/e2fsprogs
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-02-20 03:25:56 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-02-20 03:25:56 +0000
commit2ab935a3a0080faa4ac6da31d33931d312843dd9 (patch)
tree3484020655251d233b94c3270bc54dff32b2b9e3 /tools/e2fsprogs
parentb121d18ec394d8914035c1b31e77add155d59321 (diff)
downloadupstream-2ab935a3a0080faa4ac6da31d33931d312843dd9.tar.gz
upstream-2ab935a3a0080faa4ac6da31d33931d312843dd9.tar.bz2
upstream-2ab935a3a0080faa4ac6da31d33931d312843dd9.zip
tools/e2fsprogs: move uuid/uuid.h into a subdirectory, it conflicts with a system header file with the same name on darwin
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25598 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools/e2fsprogs')
-rw-r--r--tools/e2fsprogs/Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/e2fsprogs/Makefile b/tools/e2fsprogs/Makefile
index 413e965a0e..0bfcfb4f0f 100644
--- a/tools/e2fsprogs/Makefile
+++ b/tools/e2fsprogs/Makefile
@@ -30,6 +30,9 @@ CONFIGURE_ARGS += \
define Host/Install
$(Host/Install/Default)
$(MAKE) -C $(HOST_BUILD_DIR)/lib/uuid install
+ mkdir -p $(STAGING_DIR_HOST)/include/e2fsprogs
+ $(CP) $(STAGING_DIR_HOST)/include/uuid $(STAGING_DIR_HOST)/include/e2fsprogs/
+ rm -rf $(STAGING_DIR_HOST)/include/uuid
$(INSTALL_DATA) $(HOST_BUILD_DIR)/lib/uuid/libuuid.a $(STAGING_DIR_HOST)/lib/
endef