From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 29 Sep 2006 21:46:55 +0000 (+0000)
Subject: openswan makefile cleanup and compile fix
X-Git-Url: https://git.rohieb.name/openwrt.git/commitdiff_plain/5d5a8fa86414bf083fcecafd131f6fde82a3d4ce

openswan makefile cleanup and compile fix

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4882 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/openswan/Makefile b/package/openswan/Makefile
index 1ea3b4b4f..54b565efd 100644
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@@ -19,6 +19,7 @@ PKG_MD5SUM:=b34d71ca49dedad017879b0e912d40dd
 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 PKG_INIT_PRIO:=60
 
@@ -64,23 +65,16 @@ PKG_MAKE_OPTS:= \
 		INC_USRLOCAL="/usr" \
 
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(PKG_MAKE_OPTS) \
-		module
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(PKG_MAKE_OPTS) \
 		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-		programs
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		programs module install
 endef
 
 define Package/openswan/install
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(PKG_MAKE_OPTS) \
-		DESTDIR="$(1)" \
-		install
+	$(CP) $(PKG_INSTALL_DIR)/* $(1)
 	install -d -m0755 $(1)/etc/init.d
 	$(CP) $(1)/etc/rc.d/init.d/ipsec $(1)/etc/init.d/S$(PKG_INIT_PRIO)ipsec
 	rm -rf $(1)/usr/share