X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/87b849886f5cc4a0d7ae855238e49eb8ec1cdf6e..c0d50e3077a43cf6ad6565ab88fdf1c22f769f79:/package/dsniff/Makefile

diff --git a/package/dsniff/Makefile b/package/dsniff/Makefile
index 2f95d6aee..ee5a19863 100644
--- a/package/dsniff/Makefile
+++ b/package/dsniff/Makefile
@@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dsniff
 PKG_VERSION:=2.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MD5SUM:=183e336a45e38013f3af840bddec44b4
 
 PKG_SOURCE_URL:=http://www.monkey.org/~dugsong/dsniff/
@@ -18,7 +18,7 @@ include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,DSNIFF,dsniff,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
 	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
@@ -32,7 +32,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
 		  --program-suffix="" \
 		  --prefix=/usr \
 		  --exec-prefix=/usr \
-		  --bindir=/usr/sbin \
+		  --bindir=/usr/bin \
 		  --datadir=/usr/share \
 		  --includedir=/usr/include \
 		  --infodir=/usr/share/info \
@@ -43,6 +43,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
 		  --sbindir=/usr/sbin \
 		  --sysconfdir=/etc \
 		  --without-db \
+		  --without-x \
 		  --with-gdbm="$(STAGING_DIR)/usr" \
 		  --with-libnids="$(STAGING_DIR)/usr" \
 		  --with-libpcap="$(STAGING_DIR)/usr" \
@@ -65,7 +66,11 @@ $(PKG_BUILD_DIR)/.built:
 $(IPKG_DSNIFF):
 	install -d -m0755 $(IDIR_DSNIFF)/usr/lib
 	install -d -m0755 $(IDIR_DSNIFF)/usr/sbin
-	cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/* $(IDIR_DSNIFF)/usr/sbin
-	cp -fpR  $(PKG_INSTALL_DIR)/usr/lib/* $(IDIR_DSNIFF)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/* $(IDIR_DSNIFF)/usr/sbin
+	$(CP)  $(PKG_INSTALL_DIR)/usr/lib/* $(IDIR_DSNIFF)/usr/lib
 	$(RSTRIP) $(IDIR_DSNIFF)
 	$(IPKG_BUILD) $(IDIR_DSNIFF) $(PACKAGE_DIR)
+
+mostlyclean:
+	make -C $(PKG_BUILD_DIR) clean
+	rm $(PKG_BUILD_DIR)/.built