Author: jhuntwork
Date: 2005-07-24 09:04:54 -0600 (Sun, 24 Jul 2005)
New Revision: 399
Modified:
x86/trunk/Makefile
x86/trunk/packages/diffutils/Makefile
Log:
Updated diffutils Makefile
Modified: x86/trunk/Makefile
===================================================================
--- x86/trunk/Makefile 2005-07-24 14:57:00 UTC (rev 398)
+++ x86/trunk/Makefile 2005-07-24 15:04:54 UTC (rev 399)
@@ -177,9 +177,6 @@
lfs-util-linux-scpt lfs-perl-scpt lfs-strip
@cp /etc/resolv.conf $(WD)/etc
-STOP:
- exit 1;
-
prep-chroot:
@-mkdir -p $(MP)/{proc,sys}
@-mount -t proc proc $(MP)/proc
Modified: x86/trunk/packages/diffutils/Makefile
===================================================================
--- x86/trunk/packages/diffutils/Makefile 2005-07-24 14:57:00 UTC (rev
398)
+++ x86/trunk/packages/diffutils/Makefile 2005-07-24 15:04:54 UTC (rev
399)
@@ -1,38 +1,89 @@
# diffutils Makefile
+#==============================================================================
-# Package versions
NM= diffutils
VRS= 2.8.1
DIR= $(NM)-$(VRS)
+
FILE= $(DIR).tar.bz2
-URL= $(HTTP)/$(NM)/$(FILE)
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= 9f56abe0b443b8d2d406565a461b3a219950b5db
-# RULES
+# Targets
+# =============================================================================
-.PHONY: stage1 clean chroot stage2
+include $(ROOT)/scripts/functions
-stage1:
- @echo ""
- @echo "=====> Building $(NM)"
- @echo ""
- @if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
- mv $(FILE) $(SRC) ; fi
- @if [ ! -f $(WD)/bin/diff ] ; then unpack $(SRC)/$(FILE) && cd $(DIR)
&& \
- ./configure --prefix=$(WD) && make -j3 && make install ; fi
- @make clean
+stage1: $(FILE)
+ @$(std_build)
+ @cp $(SRC)/$(FILE) $(LFSSRC)
+compile-stage1:
+ @$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+ @./configure --prefix=$(WD) >../$(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
+#
+#==Status Messages==========================================
+#
+ @$(OK)
+
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/diff ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) &&
\
- ./configure --prefix=/usr && make -j3 && make install ; fi
- @make clean
-
+stage2: Makefile $(FILE) $(PATCH1)
+ @$(std_build)
+
+compile-stage2:
+ @$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+ @./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
+#
+#==Status Messages===========================================
+#
+ @$(OK)
+
clean:
@-rm -rf $(DIR)
+
+.PHONY: compile-stage1 clean chroot compile-stage2
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
