Standardize Makefile ; Fix to find openssl blowfish crypto in STAGING_DIR

SVN-Revision: 1390

diff --git a/openwrt/package/vtun/Makefile b/openwrt/package/vtun/Makefile
index 49daaa3a215a3a39618dd30a30c32d718cc2d2e4..306c25d3fe03b300a6750c8c28b0e9a306fde0b4 100644 (file)
--- a/openwrt/package/vtun/Makefile
+++ b/openwrt/package/vtun/Makefile
@@ -2,60 +2,62 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME := vtun
-PKG_VERSION := 2.6
-PKG_RELEASE := 1
-PKG_MD5SUM := 309534fd03c5d13a19c43916f61f4bbf
+PKG_NAME:=vtun
+PKG_VERSION:=2.6
+PKG_RELEASE:=1
+PKG_MD5SUM:=309534fd03c5d13a19c43916f61f4bbf
 
-PKG_SOURCE_URL := @SF/vtun
-PKG_SOURCE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-PKG_CAT := zcat
+PKG_SOURCE_URL:=@SF/vtun
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_CAT:=zcat
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
 include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,VTUN,vtun,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 $(PKG_BUILD_DIR)/.configured:
-       (cd $(PKG_BUILD_DIR) ; \
-       $(TARGET_CONFIGURE_OPTS) \
-       CFLAGS="$(TARGET_CFLAGS) \
-       -I$(STAGING_DIR)/usr/include" \
-       LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
-       ./configure \
-       --target=$(GNU_TARGET_NAME) \
-       --host=$(GNU_TARGET_NAME) \
-       --build=$(GNU_HOST_NAME) \
-       --prefix=/usr \
-       --exec-prefix=/usr \
-       --bindir=/usr/bin \
-       --sbindir=/usr/sbin \
-       --libexecdir=/usr/lib \
-       --datadir=/usr/share \
-       --infodir=/usr/share/info \
-       --mandir=/usr/share/man \
-       --localstatedir=/var \
-       --sysconfdir=/etc \
-       --with-kernel=$(LINUX_DIR) \
-       --with-zlib=$(STAGING_DIR)/usr/ \
-       --with-lzo-headers=$(STAGING_DIR)/usr/include \
-       --with-lzo-libs=$(STAGING_DIR)/usr/lib \
-       $(DISABLE_NLS) )
-       touch $(PKG_BUILD_DIR)/.configured
+       (cd $(PKG_BUILD_DIR) ; rm -rf config.{cache,status} ; \
+               $(TARGET_CONFIGURE_OPTS) \
+               CFLAGS="$(TARGET_CFLAGS)" \
+               CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
+               LIBS="-L$(STAGING_DIR)/usr/lib" \
+               BLOWFISH_HDR_DIR="$(STAGING_DIR)/usr/include/openssl" \
+               LZO_HDR_DIR="$(STAGING_DIR)/usr/include" \
+               SSL_HDR_DIR="$(STAGING_DIR)/usr/include/openssl" \
+               ./configure \
+               --target=$(GNU_TARGET_NAME) \
+               --host=$(GNU_TARGET_NAME) \
+               --build=$(GNU_HOST_NAME) \
+               --program-prefix="" \
+               --program-suffix="" \
+               --prefix=/usr \
+               --exec-prefix=/usr \
+               --bindir=/usr/bin \
+               --datadir=/usr/share \
+               --includedir=/usr/include \
+               --infodir=/usr/share/info \
+               --libdir=/usr/lib \
+               --libexecdir=/usr/lib \
+               --localstatedir=/var \
+               --mandir=/usr/share/man \
+               --sbindir=/usr/sbin \
+               --sysconfdir=/etc \
+               $(DISABLE_LARGEFILE) \
+               $(DISABLE_NLS) \
+       )
+       touch $@
 
 $(PKG_BUILD_DIR)/.built:
        $(MAKE) -C $(PKG_BUILD_DIR) \
-       CC=$(TARGET_CC) \
-       CFLAGS="$(TARGET_CFLAGS) \
-       -I$(STAGING_DIR)/usr/include" \
-       LDFLAGS="-L$(STAGING_DIR)/usr/lib -lssl -lz -llzo -lcrypto" \
-       vtund
+               vtund
        touch $@
 
 $(IPKG_VTUN):
-       mkdir -p $(IDIR_VTUN)/usr/sbin
-       cp $(PKG_BUILD_DIR)/vtund $(IDIR_VTUN)/usr/sbin/
-       $(STRIP) $(IDIR_VTUN)/usr/sbin/*
-       mkdir -p $(IDIR_VTUN)/etc
-       cp $(PKG_BUILD_DIR)/vtund.conf $(IDIR_VTUN)/etc
+       install -m0755 -d $(IDIR_VTUN)/etc
+       install -m0600 $(PKG_BUILD_DIR)/vtund.conf $(IDIR_VTUN)/etc/
+       install -m0755 -d $(IDIR_VTUN)/usr/sbin
+       install -m0755 $(PKG_BUILD_DIR)/vtund $(IDIR_VTUN)/usr/sbin/
+       $(RSTRIP) $(IDIR_VTUN)
        $(IPKG_BUILD) $(IDIR_VTUN) $(PACKAGE_DIR)