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
commit11c08a39bc207e2042dabe7966595caeb0fe4834 (patch)
tree8c0e4e893a9d2e44e912f58fc5c1edeec06e1150 /tools/e2fsprogs
parentd56fe0cf5389dae4096d13eb16e3fc0d28360f88 (diff)
downloadupstream-11c08a39bc207e2042dabe7966595caeb0fe4834.tar.gz
upstream-11c08a39bc207e2042dabe7966595caeb0fe4834.tar.bz2
upstream-11c08a39bc207e2042dabe7966595caeb0fe4834.zip
tools/e2fsprogs: move uuid/uuid.h into a subdirectory, it conflicts with a system header file with the same name on darwin
SVN-Revision: 25598
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