r467 - x86/trunk/packages/zip

justin at linuxfromscratch.org justin at linuxfromscratch.org
Mon Aug 1 13:35:35 PDT 2005


Author: justin
Date: 2005-08-01 14:35:33 -0600 (Mon, 01 Aug 2005)
New Revision: 467

Modified:
   x86/trunk/packages/zip/Makefile
Log:
Updated zip Makefile.

Modified: x86/trunk/packages/zip/Makefile
===================================================================
--- x86/trunk/packages/zip/Makefile	2005-08-01 19:44:16 UTC (rev 466)
+++ x86/trunk/packages/zip/Makefile	2005-08-01 20:35:33 UTC (rev 467)
@@ -1,29 +1,48 @@
 # Zip Makefile
+#==============================================================================
 
-# Package versions
 NM= zip
 VRS= 2.31
 DIR= $(NM)-$(VRS)
-FILE= $(NM)231.tar.gz
-URL= http://www.mirrorservice.org/sites/ftp.info-zip.org/pub/infozip/src/$(FILE)
 
-#RULES
+FILE= $(NM)231.tar.bz2
+URL-$(FILE)= $(HTTPBLFS)/W-Z/$(FILE)
+SHA-$(FILE)= 9e9a4718a03fa8d4cccd3802916268afeaf588bb
 
-.PHONY: clean chroot stage2
+# Targets
+# =============================================================================
 
+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/zip ] ; then unpack $(FILE) && cd $(DIR) && \
-	 sed -i -e 's@$$(INSTALL) man/zip.1@$$(INSTALL_PROGRAM) man/zip.1@' unix/Makefile && \
-	 make prefix=/usr -f unix/Makefile generic_gcc && \
-	 make prefix=/usr -f unix/Makefile install ; fi
-	@make clean
+stage2: Makefile $(FILE)
+	@$(std_build)
 
+compile-stage2:
+	@$(call echo_message, Making)
+#==============================================================================
+# Make commands below \/
+#==============================================================================
+	@sed -i -e 's@$$(INSTALL) man/zip.1@$$(INSTALL_PROGRAM) man/zip.1@' unix/Makefile
+	@make prefix=/usr -f unix/Makefile generic_gcc >../$(DIR)-$@.log 2>&1
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+	@$(call echo_message, Installing)
+#==============================================================================
+# Install commands below \/
+#==============================================================================
+	@make prefix=/usr -f unix/Makefile install >>../$(DIR)-$@.log 2>&1
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+
 clean:
 	@-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2




More information about the livecd mailing list