add some gcc 4.0 fixes

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

diff --git a/openwrt/package/kismet/Makefile b/openwrt/package/kismet/Makefile
index 20b7fed..7b8c57c 100644 (file)
--- a/openwrt/package/kismet/Makefile
+++ b/openwrt/package/kismet/Makefile
@@ -81,6 +81,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
                --sbindir=/usr/sbin \
                --sysconfdir=/etc \
                --enable-syspcap=yes \
                --sbindir=/usr/sbin \
                --sysconfdir=/etc \
                --enable-syspcap=yes \

+               --disable-wsp100 \

                $(DISABLE_NLS) \
                $(DISABLE_LARGEFILE) \
        );
                $(DISABLE_NLS) \
                $(DISABLE_LARGEFILE) \
        );


@@ -94,6 +95,9 @@ $(PKG_BUILD_DIR)/kismet_server $(PKG_BUILD_DIR)/kismet_drone $(PKG_BUILD_DIR)/ki
 
 $(IPKG_SERVER): $(PKG_BUILD_DIR)/kismet_server
        $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_SERVER) kismet-server.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
 
 $(IPKG_SERVER): $(PKG_BUILD_DIR)/kismet_server
        $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_SERVER) kismet-server.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)

+       mkdir -p $(IDIR_SERVER)/etc
+       cp ./files/kismet.conf $(IDIR_SERVER)/etc/
+       echo '/etc/kismet.conf' > $(IDIR_SERVER)/CONTROL/conffiles

        mkdir -p $(IDIR_SERVER)/usr/sbin
        cp $< $(IDIR_SERVER)/usr/sbin/
        $(STRIP) $(IDIR_SERVER)/usr/sbin/*
        mkdir -p $(IDIR_SERVER)/usr/sbin
        cp $< $(IDIR_SERVER)/usr/sbin/
        $(STRIP) $(IDIR_SERVER)/usr/sbin/*


@@ -105,6 +109,9 @@ $(INFO_SERVER): $(IPKG_SERVER)
 
 $(IPKG_DRONE): $(PKG_BUILD_DIR)/kismet_drone
        $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_DRONE) kismet-drone.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
 
 $(IPKG_DRONE): $(PKG_BUILD_DIR)/kismet_drone
        $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_DRONE) kismet-drone.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)

+       mkdir -p $(IDIR_DRONE)/etc
+       cp ./files/kismet_drone.conf $(IDIR_DRONE)/etc/
+       echo '/etc/kismet_drone.conf' > $(IDIR_DRONE)/CONTROL/conffiles

        mkdir -p $(IDIR_DRONE)/usr/sbin
        cp $< $(IDIR_DRONE)/usr/sbin/
        $(STRIP) $(IDIR_DRONE)/usr/sbin/*
        mkdir -p $(IDIR_DRONE)/usr/sbin
        cp $< $(IDIR_DRONE)/usr/sbin/
        $(STRIP) $(IDIR_DRONE)/usr/sbin/*


@@ -116,6 +123,11 @@ $(INFO_DRONE): $(IPKG_DRONE)
 
 $(IPKG_CLIENT): $(PKG_BUILD_DIR)/kismet_client
        $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_CLIENT) kismet-client.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
 
 $(IPKG_CLIENT): $(PKG_BUILD_DIR)/kismet_client
        $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_CLIENT) kismet-client.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)

+       mkdir -p $(IDIR_CLIENT)/etc
+       cp ./files/kismet.conf $(IDIR_CLIENT)/etc/
+       cp ./files/kismet_ui.conf $(IDIR_CLIENT)/etc/
+       echo '/etc/kismet.conf' > $(IDIR_CLIENT)/CONTROL/conffiles
+       echo '/etc/kismet_ui.conf' >> $(IDIR_CLIENT)/CONTROL/conffiles

        mkdir -p $(IDIR_CLIENT)/usr/sbin
        cp $< $(IDIR_CLIENT)/usr/sbin/
        $(STRIP) $(IDIR_CLIENT)/usr/sbin/*
        mkdir -p $(IDIR_CLIENT)/usr/sbin
        cp $< $(IDIR_CLIENT)/usr/sbin/
        $(STRIP) $(IDIR_CLIENT)/usr/sbin/*