- use the correct installation path.

diff --git a/package/openswan/openswan.mk b/package/openswan/openswan.mk
index b25251b90635c5986210772ef66604e1826e039e..b6a3e27005347eb0dd815587b0fe71102e8922b2 100644 (file)
--- a/package/openswan/openswan.mk
+++ b/package/openswan/openswan.mk
@@ -11,8 +11,8 @@ OPENSWAN_SOURCE:=openswan-$(OPENSWAN_VERSION).tar.gz
 OPENSWAN_SITE:=http://www.openswan.org/download/
 OPENSWAN_DIR:=$(BUILD_DIR)/openswan-$(OPENSWAN_VERSION)
 OPENSWAN_CAT:=$(ZCAT)
-OPENSWAN_BINARY:=openswan
-OPENSWAN_TARGET_BINARY:=usr/sbin/openswan
+OPENSWAN_BINARY:=programs/pluto/pluto
+OPENSWAN_TARGET_BINARY:=usr/sbin/ipsec
 
 $(DL_DIR)/$(OPENSWAN_SOURCE):
         $(WGET) -P $(DL_DIR) $(OPENSWAN_SITE)/$(OPENSWAN_SOURCE)
@@ -28,16 +28,16 @@ $(OPENSWAN_DIR)/.configured: $(OPENSWAN_DIR)/.unpacked
        touch  $(OPENSWAN_DIR)/.configured
 
 $(OPENSWAN_DIR)/$(OPENSWAN_BINARY): $(OPENSWAN_DIR)/.configured
-       echo $(LINUX_KERNEL)
+       @echo $(LINUX_KERNEL)
        $(TARGET_CONFIGURE_OPTS) \
        $(MAKE) -C $(OPENSWAN_DIR) \
-               KERNELSRC=$(LINUX_DIR) DESTDIR=$(TARGET_DIR) \
+               KERNELSRC=$(LINUX_DIR) DESTDIR=$(TARGET_DIR) INC_USRLOCAL=/usr \
                CC=$(TARGET_CC) USERCOMPILE="-UDEBUG -DNO_DEBUG -ULEAK_DETECTIVE $(TARGET_CFLAGS) -I$(TARGET_DIR)/usr/include" LD_LIBRARY_PATH=$(TARGET_DIR)/usr/lib programs
 
 $(TARGET_DIR)/$(OPENSWAN_TARGET_BINARY): $(OPENSWAN_DIR)/$(OPENSWAN_BINARY)
        $(TARGET_CONFIGURE_OPTS) \
        $(MAKE) -C $(OPENSWAN_DIR) \
-               KERNELSRC=$(LINUX_DIR) DESTDIR=$(TARGET_DIR) \
+               KERNELSRC=$(LINUX_DIR) DESTDIR=$(TARGET_DIR) INC_USRLOCAL=/usr \
                CC=$(TARGET_CC) USERCOMPILE="-UDEBUG -DNO_DEBUG -ULEAK_DETECTIVE $(TARGET_CFLAGS) -I$(TARGET_DIR)/usr/include" LD_LIBRARY_PATH=$(TARGET_DIR)/usr/lib install
        rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
                $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc