From b542ba8f040376a1aa830f988de8e33463bf5792 Mon Sep 17 00:00:00 2001 From: Hamish Guthrie Date: Mon, 31 Jan 2011 11:23:14 +0000 Subject: [PATCH] [packages] cppunit: Fix install SVN-Revision: 25261 --- devel/cppunit/Makefile | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/devel/cppunit/Makefile b/devel/cppunit/Makefile index e23cf24540..594c350b39 100644 --- a/devel/cppunit/Makefile +++ b/devel/cppunit/Makefile @@ -15,6 +15,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/cppunit PKG_MD5SUM:=bd30e9cf5523cdfc019b94f5e1d7fd19 +include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/package.mk define Package/cppunit @@ -28,22 +29,20 @@ define Package/cppunit/description Unit Testing Library for C++ endef +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install +endef + define Build/InstallDev - echo InstallDev installing to $(1) $(INSTALL_DIR) $(1)/usr/include/cppunit - $(CP) $(PKG_BUILD_DIR)/include/cppunit/* $(1)/usr/include/cppunit/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/cppunit $(1)/usr/include $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/src/cppunit/.libs/libcppunit*so* $(1)/usr/lib/ - $(INSTALL_DIR) $(STAGING_DIR)/usr/include/cppunit - $(CP) $(PKG_BUILD_DIR)/include/cppunit/* $(STAGING_DIR)/usr/include/cppunit/ - $(INSTALL_DIR) $(STAGING_DIR)/usr/lib - $(CP) $(PKG_BUILD_DIR)/src/cppunit/.libs/libcppunit*so* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcppunit*so* $(1)/usr/lib/ endef define Package/cppunit/install - echo install installing to $(1) $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/src/cppunit/.libs/libcppunit*so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcppunit*so* $(1)/usr/lib/ endef $(eval $(call BuildPackage,cppunit)) -- 2.30.2