Author: justin
Date: 2005-08-01 18:34:47 -0600 (Mon, 01 Aug 2005)
New Revision: 476

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

Modified: x86/trunk/packages/traceroute/Makefile
===================================================================
--- x86/trunk/packages/traceroute/Makefile      2005-08-02 00:24:52 UTC (rev 
475)
+++ x86/trunk/packages/traceroute/Makefile      2005-08-02 00:34:47 UTC (rev 
476)
@@ -1,31 +1,59 @@
 # Traceroute Makefile
+#==============================================================================
 
-# Package versions
 NM= traceroute
 VRS= 1.4a12
 DIR= $(NM)-$(VRS)
-FILE= $(DIR).tar.gz
-URL= ftp://ftp.ee.lbl.gov/$(FILE)
 
-#RULES
+FILE= $(DIR).tar.bz2
+URL-$(FILE)= $(HTTPBLFS)/T-V/$(FILE)
+SHA-$(FILE)= c68ec1b09539a8e9655c138031c3090bda92d5f1
 
-.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/traceroute ] ; then unpack $(FILE) && cd $(DIR) && \
-        sed -i -e 's/-o bin/-o root/' Makefile.in && \
-        ./configure --prefix=/usr && \
-        make && \
-        make install && make install-man && \
-        mv /usr/sbin/traceroute /usr/bin ; fi
-       @make clean
+stage2: Makefile $(FILE)
+       @$(std_build)
 
+compile-stage2:
+       @$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+       @sed -i -e 's/-o bin/-o root/' Makefile.in
+       @./configure --prefix=/usr >../$(DIR)[EMAIL PROTECTED] 2>&1
+#
+#==Status Messages==========================================
+#
+       @$(OK)
+       @$(call echo_message, Making)
+#==============================================================================
+# Make commands below \/
+#==============================================================================
+       @make $(PM) >>../$(DIR)[EMAIL PROTECTED] 2>&1
+#
+#==Status Messages===========================================
+#
+       @$(OK)
+       @$(call echo_message, Installing)
+#==============================================================================
+# Install commands below \/
+#==============================================================================
+       @make install >>../$(DIR)[EMAIL PROTECTED] 2>&1
+       @make install-man >>../$(DIR)[EMAIL PROTECTED] 2>&1
+       @mv /usr/sbin/traceroute /usr/bin
+#
+#==Status Messages===========================================
+#
+       @$(OK)
+
 clean:
        @-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2

-- 
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page

Reply via email to