From 98409fcf5f0c9b9ae8eebf1dd425ff3e5195a990 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 25 Apr 2011 07:05:35 +0200 Subject: only build one copy of libuuid/libblkid --- package/e2fsprogs/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package/e2fsprogs/Makefile') diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index 0b8a69eea..a61fa4e63 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -58,6 +58,9 @@ MAKE_FLAGS+= BUILD_CC="${CC_FOR_BUILD}" \ BUILD_CPPFLAGS="${CPPFLAGS_FOR_BUILD}" post-build: + ${INSTALL_DIR} ${STAGING_DIR}/usr/include/uuid + ${CP} ${WRKBUILD}/lib/uuid/uuid.h \ + ${STAGING_DIR}/usr/include/uuid ifeq ($(ADK_PACKAGE_E2FSCK_STATIC),y) ${MAKE} -C ${WRKBUILD}/e2fsck e2fsck.static ${INSTALL_DIR} ${WRKINST}/usr/sbin @@ -111,9 +114,6 @@ libuuid-install: ${INSTALL_DIR} ${IDIR_LIBUUID}/usr/lib ${CP} ${WRKINST}/usr/lib/libuuid.so* \ ${IDIR_LIBUUID}/usr/lib - ${INSTALL_DIR} ${STAGING_DIR}/usr/include/uuid - ${CP} ${WRKBUILD}/lib/uuid/uuid.h \ - ${STAGING_DIR}/usr/include/uuid libuuid-dev-install: ${INSTALL_DIR} ${IDIR_LIBUUID_DEV}/usr/include -- cgit v1.2.3