r525 - in x86/trunk: . packages/ppp

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Tue Aug 2 15:30:50 PDT 2005


Author: jhuntwork
Date: 2005-08-02 16:30:48 -0600 (Tue, 02 Aug 2005)
New Revision: 525

Modified:
   x86/trunk/packages/ppp/Makefile
   x86/trunk/todo-list
Log:
Updated ppp Makefile

Modified: x86/trunk/packages/ppp/Makefile
===================================================================
--- x86/trunk/packages/ppp/Makefile	2005-08-02 22:27:21 UTC (rev 524)
+++ x86/trunk/packages/ppp/Makefile	2005-08-02 22:30:48 UTC (rev 525)
@@ -1,30 +1,58 @@
 # ppp Makefile
+#==============================================================================
 
-# Package versions
 NM= ppp
 VRS= 2.4.3
 DIR= $(NM)-$(VRS)
-FILE= $(DIR).tar.gz
-URL= http://ccache.samba.org/ftp/ppp/$(FILE)
 
-#RULES
+FILE= $(DIR).tar.bz2
+URL-$(FILE)= $(HTTPBLFS)/P-M/$(FILE)
+SHA-$(FILE)= 7f3840464639f3575d08f9394cfbce65b1956aa8
 
-.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/sbin/pppd ] ; then unpack $(FILE) && cd $(DIR) && \
-	 ./configure --prefix=/usr && \
-	 make -j3 && make install && \
-	 cp -a $(ROOT)/etc/ppp /etc && \
-	 chown -R 0:0 /etc/ppp ; 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
+	@cp -a $(ROOT)/etc/ppp /etc
+	@chown -R 0:0 /etc/ppp
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+
 clean:
 	@-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2

Modified: x86/trunk/todo-list
===================================================================
--- x86/trunk/todo-list	2005-08-02 22:27:21 UTC (rev 524)
+++ x86/trunk/todo-list	2005-08-02 22:30:48 UTC (rev 525)
@@ -14,7 +14,6 @@
 pkgconfig
 popt
 portmap
-ppp
 procps
 psmisc
 shadow




More information about the livecd mailing list