tweak snort & snort-wireless makefiles

[openwrt/svn-archive/archive.git] / net / snort-wireless / Makefile

diff --git a/net/snort-wireless/Makefile b/net/snort-wireless/Makefile
index cf8bcf4d0e028c93d90476fa95f11012802a696c..ddfa7926cbed219ee068ce04ace67e4dd3ce397a 100644 (file)
--- a/net/snort-wireless/Makefile
+++ b/net/snort-wireless/Makefile
@@ -48,15 +48,9 @@ define Package/snort-wireless-pgsql
 endef
 
 
-ifneq ($(SDK),)
-  CONFIG_PACKAGE_snort-wireless:=m
-  CONFIG_PACKAGE_snort-wireless-mysql:=m
-  CONFIG_PACKAGE_snort-wireless-pgsql:=m
-endif
-
 define Compile/Template
 
-$(PKG_BUILD_DIR)/snort-wireless-$(1): $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/snort$(1): $(PKG_BUILD_DIR)/.configured
        touch -r $(PKG_BUILD_DIR)/Makefile.am $(PKG_BUILD_DIR)/configure.in 
        touch -r $(PKG_BUILD_DIR)/Makefile.in $(PKG_BUILD_DIR)/configure
        -$(MAKE) -C $(PKG_BUILD_DIR) distclean
@@ -78,62 +72,74 @@ $(PKG_BUILD_DIR)/snort-wireless-$(1): $(PKG_BUILD_DIR)/.configured
        $(MAKE) -C $(PKG_BUILD_DIR) \
                extra_incl="" \
                all
-       mv $(PKG_BUILD_DIR)/src/snort $(PKG_BUILD_DIR)/snort-wireless-$(1)
+       mv $(PKG_BUILD_DIR)/src/snort $(PKG_BUILD_DIR)/snort$(1)
 
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/snort-wireless-$(1)
+$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/snort$(1)
 
 endef
 
 
 define Install/Template
 
-define Package/$(1)/conffiles
+define Package/snort-wireless$(1)/conffiles
 /etc/default/snort
 /etc/snort/snort.conf
 /etc/snort/threshold.conf
 endef
 
-define Package/$(1)/install
-       install -d -m0755 $$(1)/usr/sbin
-       install -m0755 $(PKG_BUILD_DIR)/snort-wireless-$(2) $$(1)/usr/sbin/snort
-       install -d -m0755 $$(1)/etc/snort
-       install -m0644 $(PKG_BUILD_DIR)/etc/snort.conf $$(1)/etc/snort/
-       install -m0644 $(PKG_BUILD_DIR)/etc/classification.config $$(1)/etc/snort/
-       install -m0644 $(PKG_BUILD_DIR)/etc/gen-msg.map $$(1)/etc/snort/
-       install -m0644 $(PKG_BUILD_DIR)/etc/reference.config $$(1)/etc/snort/
-       install -m0644 $(PKG_BUILD_DIR)/etc/sid-msg.map $$(1)/etc/snort/
-       install -m0644 $(PKG_BUILD_DIR)/etc/threshold.conf $$(1)/etc/snort/
-       install -m0644 $(PKG_BUILD_DIR)/etc/unicode.map $$(1)/etc/snort/
-       install -d -m0755 $$(1)/etc/default
-       install -m0644 ./files/snort-wireless.default $$(1)/etc/default/snort
-       install -d -m0755 $$(1)/etc/init.d
-       install -m0755 ./files/snort-wireless.init $$(1)/etc/init.d/snort
+define Package/snort-wireless$(1)/install
+       $(INSTALL_DIR) $$(1)/usr/sbin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/snort$(1) $$(1)/usr/sbin/snort
+       $(INSTALL_DIR) $$(1)/etc/snort
+       $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/snort.conf $$(1)/etc/snort/
+       $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/classification.config $$(1)/etc/snort/
+       $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/gen-msg.map $$(1)/etc/snort/
+       $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/reference.config $$(1)/etc/snort/
+       $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/sid-msg.map $$(1)/etc/snort/
+       $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/threshold.conf $$(1)/etc/snort/
+       $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/unicode.map $$(1)/etc/snort/
+       $(INSTALL_DIR) $$(1)/etc/default
+       $(INSTALL_DATA) ./files/snort-wireless.default $$(1)/etc/default/snort
+       $(INSTALL_DIR) $$(1)/etc/init.d
+       $(INSTALL_BIN) ./files/snort-wireless.init $$(1)/etc/init.d/snort
 endef
 
 endef
 
 
-ifneq ($(CONFIG_PACKAGE_snort-wireless),)
-  $(eval $(call Compile/Template,basic, \
+ifneq ($(SDK)$(CONFIG_PACKAGE_snort-wireless),)
+  define Compile/snort-wireless
+    $(call Compile/Template,, \
                --without-mysql \
                --without-postgresql \
-  ))
-  $(eval $(call Install/Template,snort-wireless,basic))
+    )
+    $(call Install/Template,)
+  endef
 endif
-ifneq ($(CONFIG_PACKAGE_snort-wireless-mysql),)
-  $(eval $(call Compile/Template,mysql, \
+$(eval $(Compile/snort-wireless))
+
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_snort-wireless-mysql),)
+  define Compile/snort-wireless-mysql
+    $(call Compile/Template,-mysql, \
                --with-mysql="$(STAGING_DIR)/usr" \
                --without-postgresql \
-  ))
-  $(eval $(call Install/Template,snort-wireless-mysql,mysql))
+    )
+    $(call Install/Template,-mysql)
+  endef
 endif
-ifneq ($(CONFIG_PACKAGE_snort-wireless-pgsql),)
-  $(eval $(call Compile/Template,pgsql, \
+$(eval $(Compile/snort-wireless-mysql))
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_snort-wireless-pgsql),)
+  define Compile/snort-wireless-pgsql
+    $(call Compile/Template,-pgsql, \
                --without-mysql \
                --with-postgresql="$(STAGING_DIR)/usr" \
-  ))
-  $(eval $(call Install/Template,snort-wireless-pgsql,pgsql))
+    )
+    $(call Install/Template,-pgsql)
+  endef
 endif
+$(eval $(Compile/snort-wireless-pgsql))
 
 define Build/Configure
 endef