r442 - x86/trunk/packages/curl

justin at linuxfromscratch.org justin at linuxfromscratch.org
Mon Aug 1 00:40:49 PDT 2005


Author: justin
Date: 2005-08-01 01:40:47 -0600 (Mon, 01 Aug 2005)
New Revision: 442

Modified:
   x86/trunk/packages/curl/Makefile
Log:
Updated curl Makefile, docs now installed in .

Modified: x86/trunk/packages/curl/Makefile
===================================================================
--- x86/trunk/packages/curl/Makefile	2005-08-01 07:27:09 UTC (rev 441)
+++ x86/trunk/packages/curl/Makefile	2005-08-01 07:40:47 UTC (rev 442)
@@ -1,31 +1,59 @@
 # Curl Makefile
+#==============================================================================
 
-# Package versions
 NM= curl
-VRS= 7.13.1
+VRS= 7.14.0
 DIR= $(NM)-$(VRS)
+
 FILE= $(DIR).tar.bz2
-URL= http://curl.haxx.se/download/$(FILE)
+URL-$(FILE)= $(HTTPBLFS)/A-C/$(FILE)
+SHA-$(FILE)= d39dd3b3603dcfa3f9b8b62ecf54d308bb124ac3
 
-#RULES
+# Targets
+# =============================================================================
 
-.PHONY: clean chroot stage2
+include $(ROOT)/scripts/functions
 
 chroot:
-	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+	@chroot "$(MP)" $(chenv-blfs) \
+	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2:
-	@echo ""
-	@echo "=====> Building $(NM) in chroot"
-	@echo ""
-	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
-	@if [ ! -f /usr/bin/curl ] ; then unpack $(FILE) && cd $(DIR) && \
-	 ./configure --prefix=/usr && \
-	 make -j3 && make install && \
-	 find docs -name "Makefile*" -o -name "*.1" -o -name "*.3" | xargs rm && \
-	 install -v -d -m755 /usr/share/doc/curl-7.12.3 && \
-	 cp -v -R docs/* /usr/share/doc/curl-7.12.3 ; fi
-	@make clean
+stage2: Makefile $(FILE)
+	@$(std_build)
 
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	 @./configure --prefix=/usr >../$(DIR)-$@.log 2>&1
+#
+#==Status Messages==========================================
+#
+	@$(OK)
+	@$(call echo_message, Making)
+#==============================================================================
+# Make commands below \/
+#==============================================================================
+	@make $(PM) >>../$(DIR)-$@.log 2>&1
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+	@$(call echo_message, Installing)
+#==============================================================================
+# Install commands below \/
+#==============================================================================
+	@make install >>../$(DIR)-$@.log 2>&1
+	@find docs -name "Makefile*" -o -name "*.1" -o -name "*.3" | xargs rm
+	@install -v -d -m755 /usr/share/doc/$(DIR)
+	@cp -R docs/* /usr/share/doc/$(DIR)
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+
 clean:
 	@-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2




More information about the livecd mailing list