r562 - x86/trunk/packages/man

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Wed Aug 10 12:00:44 PDT 2005


Author: thomasp
Date: 2005-08-10 13:00:43 -0600 (Wed, 10 Aug 2005)
New Revision: 562

Modified:
   x86/trunk/packages/man/Makefile
Log:
Updated man Makefile

Modified: x86/trunk/packages/man/Makefile
===================================================================
--- x86/trunk/packages/man/Makefile	2005-08-10 17:55:17 UTC (rev 561)
+++ x86/trunk/packages/man/Makefile	2005-08-10 19:00:43 UTC (rev 562)
@@ -1,33 +1,58 @@
 # Man Makefile
+#==============================================================================
 
-# Package versions
 NM= man
-VRS= 1.5p
+VRS= 1.6
 DIR= $(NM)-$(VRS)
+
 FILE= $(DIR).tar.bz2
-URL= $(HTTP)/$(NM)/$(FILE)
-URL1= $(HTTP)/$(NM)/$(PATCH1)
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= c40c0af784976c4e12794b9d2bcedcabc7490d41
 
-# RULES
+# Targets
+# =============================================================================
 
-.PHONY:  clean stage2 chroot
+include $(ROOT)/scripts/functions
 
 chroot:
-	@chroot "$(MP)" $(chenv-post-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+	@chroot "$(MP)" $(chenv-post-bash) \
+	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2:
-	@echo ""
-	@echo "=====> Building $(NM) in chroot"
-	@echo ""
-	@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
-	 mv $(FILE) $(SRC) ; fi
-	@if [ ! -f /usr/bin/man ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
-	 sed -i 's at -is@&R at g' configure && \
-	 sed -i 's at MANPATH./usr/man@#&@g' src/man.conf.in && \
-	 ./configure -confdir=/etc && make && \
-	 make install ; fi
-	@make clean
-	 
+stage2: Makefile $(FILE)
+	@$(std_build)
 
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@sed -i 's at -is@&R at g' configure
+	@sed -i 's at MANPATH./usr/man@#&@g' src/man.conf.in
+	@./configure -confdir=/etc >../$(DIR)-$@.log 2>&1
+#
+#==Status Messages==========================================
+#
+	@$(OK)
+	@$(call echo_message, Making)
+#==============================================================================
+# Make commands below \/
+#==============================================================================
+	@make >>../$(DIR)-$@.log 2>&1
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+	@$(call echo_message, Installing)
+#==============================================================================
+# Install commands below \/
+#==============================================================================
+	@make install >>../$(DIR)-$@.log 2>&1
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+
 clean:
 	@-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2




More information about the livecd mailing list