X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=net%2Fmatrixtunnel%2FMakefile;fp=net%2Fmatrixtunnel%2FMakefile;h=656c82477e283fa4a4198e48886e7453b0279587;hb=d1cac1e5359aa75d50ece672bb3f057715bdc81c;hp=91d9ddeceb304bdcba02c08b0daefde752cb0009;hpb=f200c1bf2ce3dc38b561fc8b9282748006b66fab;p=packages.git

diff --git a/net/matrixtunnel/Makefile b/net/matrixtunnel/Makefile
index 91d9ddece..656c82477 100644
--- a/net/matrixtunnel/Makefile
+++ b/net/matrixtunnel/Makefile
@@ -12,12 +12,12 @@ PKG_NAME:=matrixtunnel
 PKG_VERSION:=0.1
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://znerol.ch/files
 PKG_MD5SUM:=ffbbe0c50cc1863f6080aca302f7e2c8
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -27,55 +27,29 @@ define Package/matrixtunnel
   CATEGORY:=Network
   DEPENDS:=+libmatrixssl
   TITLE:=SSL tunnel based on matrixssl
-  DESCRIPTION:=SSL tunnel based on matrixssl.\\\
-    matrixtunnel is a stripped down version of stunnel \\\
-    based on matrixssl library
+  DESCRIPTION:=\
+	matrixtunnel is a stripped down version of stunnel \\\
+	based on matrixssl library.
   URL:=http://znerol.ch/svn/matrixtunnel/trunk/
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-		./configure \
-			--target=$(GNU_TARGET_NAME) \
-			--host=$(GNU_TARGET_NAME) \
-			--build=$(GNU_HOST_NAME) \
-			--program-prefix="" \
-			--program-suffix="" \
-			--prefix=/usr \
-			--exec-prefix=/usr \
-			--bindir=/usr/sbin \
-			--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) \
-			--without-libiconv-prefix \
-			--without-libintl-prefix \
-			--with-matrixssl-src=$(BUILD_DIR)/matrixssl \
-	);
+	$(call Build/Configure/Default, \
+		--without-libiconv-prefix \
+		--without-libintl-prefix \
+		--with-matrixssl-src="$(BUILD_DIR)/matrixssl" \
+	)
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR)/src \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
 define Package/matrixtunnel/install
-	install -d -m0755 $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/matrixtunnel $(1)/usr/sbin/
+	install -d -m0755 $(1)/usr/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/matrixtunnel $(1)/usr/bin/
 endef
 
 $(eval $(call BuildPackage,matrixtunnel))