From: Eric Andersen <andersen@codepoet.org>
Date: Mon, 18 Nov 2002 22:12:38 +0000 (-0000)
Subject: Update boa from Jon Nelson
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=173c607210520065a9982f48d7f76d72c46c50b4;p=buildroot.git

Update boa from Jon Nelson
---

diff --git a/make/boa.mk b/make/boa.mk
index 0b595bd4c2..ca71409582 100644
--- a/make/boa.mk
+++ b/make/boa.mk
@@ -1,64 +1,57 @@
-# 
-TARGETS += boa
-TARGETS_CLEAN += boa_clean
-TARGETS_MRPROPER += boa_mrproper
-TARGETS_DISTCLEAN += boa_distclean
+#############################################################
+#
+# boa
+#
+#############################################################
 
-BOA_VERSION=0.94.12pre1
+BOA_VERSION=0.94.14rc4
 
 # Don't alter below this line unless you (think) you know
 # what you are doing! Danger, Danger!
 
-BOA_URI=http://www.boa.org
 BOA_SOURCE=boa-$(BOA_VERSION).tar.gz
-BOA_DIR=$(BASE_DIR)/${shell basename $(BOA_SOURCE) .tar.gz}
-BOA_WORKDIR=$(BASE_DIR)/boa_workdir
+BOA_SITE=http://www.boa.org/
+BOA_DIR=$(BUILD_DIR)/${shell basename $(BOA_SOURCE) .tar.gz}
+BOA_WORKDIR=$(BUILD_DIR)/boa_workdir
 
 IMAGE_SIZE += +100
 
-$(SOURCE_DIR)/$(BOA_SOURCE):
-	while [ ! -f $(SOURCE_DIR)/$(BOA_SOURCE) ] ; do \
-		wget -P $(SOURCE_DIR) --passive-ftp $(BOA_URI)/$(BOA_SOURCE); \
-	done
+$(DL_DIR)/$(BOA_SOURCE):
+	wget -P $(DL_DIR) $(BOA_SITE)/$(BOA_SOURCE)
 
-$(BOA_DIR)/.unpacked:	$(SOURCE_DIR)/$(BOA_SOURCE)
-	gzip -d -c $(SOURCE_DIR)/$(BOA_SOURCE) | tar -xvf -
+$(BOA_DIR)/.unpacked:	$(DL_DIR)/$(BOA_SOURCE)
+	gzip -d -c $(DL_DIR)/$(BOA_SOURCE) | tar -C $(BUILD_DIR) -xvf -
 	touch $(BOA_DIR)/.unpacked
 
 $(BOA_WORKDIR)/Makefile: $(TARGET_CC) $(BOA_DIR)/.unpacked
 	rm -f $(BOA_WORKDIR)/Makefile
 	mkdir -p $(BOA_WORKDIR)
-	if [ -f $(SOURCE_DIR)/boa-config.site-$(ARCH) ]; then \
-		(cd $(BOA_WORKDIR) && CONFIG_SITE=$(SOURCE_DIR)/boa-config.site-$(ARCH) CC=$(TARGET_CC) $(BOA_DIR)/src/configure); \
-	else \
-		(cd $(BOA_WORKDIR) && CC=$(TARGET_CC) $(BOA_DIR)/src/configure); \
-	fi
+	(cd $(BOA_WORKDIR) && CONFIG_SITE=$(SOURCE_DIR)/boa-config.site-$(ARCH) \
+		CC=$(TARGET_CC) $(BOA_DIR)/configure)
 	touch $(BOA_WORKDIR)/.depend
         
 $(BOA_WORKDIR)/boa $(BOA_WORKDIR)/boa_indexer:	$(BOA_WORKDIR)/Makefile
 	rm -f $@
-	make VPATH=$(BOA_DIR)/src/ -C $(BOA_WORKDIR)
+	$(MAKE) VPATH=$(BOA_DIR)/src/ -C $(BOA_WORKDIR)
 
 $(BOA_WORKDIR)/.installed: $(BOA_WORKDIR)/boa $(BOA_WORKDIR)/boa_indexer
 	mkdir -p $(TARGET_DIR)/usr/sbin
-	cp -f $(BOA_WORKDIR)/boa $(TARGET_DIR)/usr/sbin/boa
+	cp -f $(BOA_WORKDIR)/src/boa $(TARGET_DIR)/usr/sbin/boa
 	mkdir -p $(TARGET_DIR)/usr/lib/boa
-	cp -f $(BOA_WORKDIR)/boa_indexer $(TARGET_DIR)/usr/lib/boa/boa_indexer
+	cp -f $(BOA_WORKDIR)/src/boa_indexer $(TARGET_DIR)/usr/lib/boa/boa_indexer
 	mkdir -p $(TARGET_DIR)/etc/boa
 	cp -f $(SOURCE_DIR)/boa.conf $(TARGET_DIR)/etc/boa
 	cp -f $(SOURCE_DIR)/mime.types $(TARGET_DIR)/etc/mime.types
 	strip --strip-all $(TARGET_DIR)/usr/sbin/boa $(TARGET_DIR)/usr/lib/boa/boa_indexer
 	touch $(BOA_WORKDIR)/.installed
 
-boa:	$(BOA_WORKDIR)/.installed
+boa:	uclibc $(BOA_WORKDIR)/.installed
 
-boa_clean:
+boa-clean:
 	@if [ -d $(BOA_WORKDIR)/Makefile ] ; then \
-		make -C $(BOA_WORKDIR) clean ; \
+		$(MAKE) -C $(BOA_WORKDIR) clean ; \
 	fi;
 
-boa_mrproper:
+boa-dirclean:
 	rm -rf $(BOA_DIR) $(BOA_WORKDIR)
 
-boa_distclean:	boa_mrproper
-	rm -f $(SOURCE_DIR)/$(BOA_SOURCE)