X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=net%2Ftor%2FMakefile;h=987bdd43e1ad73e94793b934733c5347fce2021a;hp=16b6f23cc3e94bab988e1cdfc1038c34c362ee92;hb=5b0450ad12356cebdceb12a6b4f49986f4e7612f;hpb=d18006375d58bd9e4cece04153721ac316f63a23

diff --git a/net/tor/Makefile b/net/tor/Makefile
index 16b6f23cc3..987bdd43e1 100644
--- a/net/tor/Makefile
+++ b/net/tor/Makefile
@@ -80,15 +80,14 @@ endef
 
 define Build/Configure
 	$(call Build/Configure/Default,\
-		--with-libevent-dir="$(STAGING_DIR)/usr/" \
-		--with-gnu-ld \
+		--with-libevent-dir="$(STAGING_DIR)/usr" \
+		--with-ssl-dir="$(STAGING_DIR)/usr" \
 		, \
-		ac_cv_libevent_normal=yes \
-		ac_cv_openssldir="$(STAGING_DIR)/usr" \
+		ac_cv_libevent_linker_option='(none)' \
+		ac_cv_openssl_linker_option='(none)' \
 		tor_cv_null_is_zero=yes \
 		tor_cv_unaligned_ok=yes \
 		tor_cv_time_t_signed=yes \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -levent" \
 	)
 endef
 
@@ -99,12 +98,12 @@ define Build/Compile
 endef
 
 define Package/tor/install	
-	install -d -m0755 $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/usr/sbin
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/tor $(1)/usr/sbin/
-	install -d -m0755 $(1)/etc/init.d
-	install -m0755 ./files/tor.init $(1)/etc/init.d/tor
-	install -d -m0755 $(1)/etc/tor
-	install -m0644 ./files/torrc $(1)/etc/tor/torrc
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/tor.init $(1)/etc/init.d/tor
+	$(INSTALL_DIR) $(1)/etc/tor
+	$(INSTALL_DATA) ./files/torrc $(1)/etc/tor/torrc
 endef
 
 $(eval $(call BuildPackage,tor))