diff options
author | Felix Fietkau <nbd@openwrt.org> | 2006-09-29 21:46:55 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2006-09-29 21:46:55 +0000 |
commit | 94a816796493072be242ca4511782f8e78bbd252 (patch) | |
tree | 7967e7275d8f6efde37961fa812dc347f9c9ad79 | |
parent | caf5458f3947e3214cdc4085d0432dd829b04e9d (diff) | |
download | upstream-94a816796493072be242ca4511782f8e78bbd252.tar.gz upstream-94a816796493072be242ca4511782f8e78bbd252.tar.bz2 upstream-94a816796493072be242ca4511782f8e78bbd252.zip |
openswan makefile cleanup and compile fix
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4882 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r-- | package/openswan/Makefile | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/package/openswan/Makefile b/package/openswan/Makefile index 1ea3b4b4f1..54b565efdd 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 @@ -67,20 +68,13 @@ 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 |