sync with the non-ramdisk config

[openwrt.git] / openwrt / package / snort-wireless / Makefile

diff --git a/openwrt/package/snort-wireless/Makefile b/openwrt/package/snort-wireless/Makefile
index a0abd73..ebb9a3a 100644 (file)
--- a/openwrt/package/snort-wireless/Makefile
+++ b/openwrt/package/snort-wireless/Makefile
@@ -1,3 +1,5 @@
+# $Id$
+

 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=snort-wireless
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=snort-wireless


@@ -107,13 +109,11 @@ $(PKG_BUILD_DIR)/$(2): $(PKG_BUILD_DIR)/.prepared
        mv $(PKG_BUILD_DIR)/src/snort $(PKG_BUILD_DIR)/$(2)
 
 $$(IPKG_$(1)): $(PKG_BUILD_DIR)/.installed $(PKG_BUILD_DIR)/$(2)
        mv $(PKG_BUILD_DIR)/src/snort $(PKG_BUILD_DIR)/$(2)
 
 $$(IPKG_$(1)): $(PKG_BUILD_DIR)/.installed $(PKG_BUILD_DIR)/$(2)

-       rm -rf $$(IDIR_$(1))
-       $(SCRIPT_DIR)/make-ipkg-dir.sh $$(IDIR_$(1)) ./ipkg/$(2).control $(3) $(4)

        install -m0644 ./ipkg/snort-wireless.conffiles $$(IDIR_$(1))/CONTROL/conffiles
        install -d -m0755 $$(IDIR_$(1))/etc/default
        install -m0644 ./ipkg/snort-wireless.conffiles $$(IDIR_$(1))/CONTROL/conffiles
        install -d -m0755 $$(IDIR_$(1))/etc/default

-       install -m0644 ./ipkg/snort-wireless.default $$(IDIR_$(1))/etc/default/snort
+       install -m0644 ./files/snort-wireless.default $$(IDIR_$(1))/etc/default/snort

        install -d -m0755 $$(IDIR_$(1))/etc/init.d
        install -d -m0755 $$(IDIR_$(1))/etc/init.d

-       install -m0755 ./ipkg/snort-wireless.init $$(IDIR_$(1))/etc/init.d/snort
+       install -m0755 ./files/snort-wireless.init $$(IDIR_$(1))/etc/init.d/snort

        install -d -m0755 $$(IDIR_$(1))/etc/snort
        install -m0644 $(PKG_BUILD_DIR)/etc/snort.conf $$(IDIR_$(1))/etc/snort/
        install -m0644 $(PKG_BUILD_DIR)/etc/classification.config $$(IDIR_$(1))/etc/snort/
        install -d -m0755 $$(IDIR_$(1))/etc/snort
        install -m0644 $(PKG_BUILD_DIR)/etc/snort.conf $$(IDIR_$(1))/etc/snort/
        install -m0644 $(PKG_BUILD_DIR)/etc/classification.config $$(IDIR_$(1))/etc/snort/


@@ -151,5 +151,5 @@ $(PKG_BUILD_DIR)/.installed: $(PKG_BUILD_DIR)/.built
        $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                install
        $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                install

-       touch $(PKG_BUILD_DIR)/.installed
+       touch $@