fix my latest commit and remove old patches

[openwrt.git] / openwrt / package / dsniff / Makefile

diff --git a/openwrt/package/dsniff/Makefile b/openwrt/package/dsniff/Makefile
index 9f17259..484f0c5 100644 (file)
--- a/openwrt/package/dsniff/Makefile
+++ b/openwrt/package/dsniff/Makefile
@@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dsniff
 PKG_VERSION:=2.3
 
 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/
 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)))
 
 
 $(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)" \
        (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 \
                  --program-suffix="" \
                  --prefix=/usr \
                  --exec-prefix=/usr \

-                 --bindir=/usr/sbin \
+                 --bindir=/usr/bin \

                  --datadir=/usr/share \
                  --includedir=/usr/include \
                  --infodir=/usr/share/info \
                  --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 \
                  --sbindir=/usr/sbin \
                  --sysconfdir=/etc \
                  --without-db \

+                 --without-x \

                  --with-gdbm="$(STAGING_DIR)/usr" \
                  --with-libnids="$(STAGING_DIR)/usr" \
                  --with-libpcap="$(STAGING_DIR)/usr" \
                  --with-gdbm="$(STAGING_DIR)/usr" \
                  --with-libnids="$(STAGING_DIR)/usr" \
                  --with-libpcap="$(STAGING_DIR)/usr" \


@@ -63,9 +64,13 @@ $(PKG_BUILD_DIR)/.built:
        touch $@
 
 $(IPKG_DSNIFF):
        touch $@
 
 $(IPKG_DSNIFF):

-       install -d -m0755 $(IDIR_DSNIFF)/usr/share
+       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
        install -d -m0755 $(IDIR_DSNIFF)/usr/sbin
        cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/* $(IDIR_DSNIFF)/usr/sbin

-       cp -fpR  $(PKG_INSTALL_DIR)/usr/share/* $(IDIR_DSNIFF)/usr/share
+       cp -fpR  $(PKG_INSTALL_DIR)/usr/lib/* $(IDIR_DSNIFF)/usr/lib

        $(RSTRIP) $(IDIR_DSNIFF)
        $(IPKG_BUILD) $(IDIR_DSNIFF) $(PACKAGE_DIR)
        $(RSTRIP) $(IDIR_DSNIFF)
        $(IPKG_BUILD) $(IDIR_DSNIFF) $(PACKAGE_DIR)

+
+mostlyclean:
+       make -C $(PKG_BUILD_DIR) clean
+       rm $(PKG_BUILD_DIR)/.built