update avahi to v0.6.10.

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

diff --git a/openwrt/package/httping/Makefile b/openwrt/package/httping/Makefile
index 05dd1c1..dbd9208 100644 (file)
--- a/openwrt/package/httping/Makefile
+++ b/openwrt/package/httping/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 1146 2005-06-05 13:32:28Z florian $
+# $Id$

 
 include $(TOPDIR)/rules.mk
 
 
 include $(TOPDIR)/rules.mk
 


@@ -13,6 +13,12 @@ PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 

+PKG_DEPEND=libopenssl
+ifneq ($(BR2_PACKAGE_HTTPING_WITH_SSL),y)
+SSL_ENABLE:=".nossl"
+PKG_DEPEND:=""
+endif
+

 include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,HTTPING,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,HTTPING,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))


@@ -21,12 +27,13 @@ $(PKG_BUILD_DIR)/.configured:
        touch $@
 
 $(PKG_BUILD_DIR)/.built:
        touch $@
 
 $(PKG_BUILD_DIR)/.built:

-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               CC=$(TARGET_CC)
+       $(MAKE) -C $(PKG_BUILD_DIR) -f $(PKG_BUILD_DIR)/Makefile$(SSL_ENABLE) \
+               CC=$(TARGET_CC) STAGING_DIR=$(STAGING_DIR)

        touch $@
 
 $(IPKG_HTTPING): 
        mkdir -p $(IDIR_HTTPING)/usr/sbin
        touch $@
 
 $(IPKG_HTTPING): 
        mkdir -p $(IDIR_HTTPING)/usr/sbin

+       echo "Depends: $(PKG_DEPEND)" >> $(IDIR_HTTPING)/CONTROL/control

        $(CP) $(PKG_BUILD_DIR)/$(PKG_NAME) $(IDIR_HTTPING)/usr/sbin/
        $(STRIP) $(IDIR_HTTPING)/usr/sbin/*
        $(IPKG_BUILD) $(IDIR_HTTPING) $(PACKAGE_DIR)
        $(CP) $(PKG_BUILD_DIR)/$(PKG_NAME) $(IDIR_HTTPING)/usr/sbin/
        $(STRIP) $(IDIR_HTTPING)/usr/sbin/*
        $(IPKG_BUILD) $(IDIR_HTTPING) $(PACKAGE_DIR)