Author: thomasp
Date: 2005-08-01 09:58:47 -0600 (Mon, 01 Aug 2005)
New Revision: 455

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

Modified: x86/trunk/packages/mktemp/Makefile
===================================================================
--- x86/trunk/packages/mktemp/Makefile  2005-08-01 15:58:30 UTC (rev 454)
+++ x86/trunk/packages/mktemp/Makefile  2005-08-01 15:58:47 UTC (rev 455)
@@ -1,35 +1,63 @@
 # Mktemp Makefile
+#==============================================================================
 
-# Package versions
 NM= mktemp
 VRS= 1.5
 DIR= $(NM)-$(VRS)
+
 FILE= $(DIR).tar.bz2
-PATCH1= $(DIR)-add_tempfile-1.patch
-URL= $(HTTP)/$(NM)/$(FILE)
-URL1= $(HTTP)/$(NM)/$(PATCH1)
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= 57f1fa25c1ac7d564e530d8ccd7594d835cf96ad
 
-# RULES
+PATCH1= $(DIR)-add_tempfile-3.patch
+URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
+SHA-$(PATCH1)= c4ca0c1d5993a44bf82c369d60f415e2cf92b95b
 
-.PHONY:  clean stage2 chroot
+# Targets
+# =============================================================================
 
+include $(ROOT)/scripts/functions
+
 chroot:
-       @chroot "$(MP)" $(chenv-pre-bash) 'cd $(ROOT) && make ch-$(NM) 
$(chbash-pre-bash)'
+       @chroot "$(MP)" $(chenv-pre-bash) \
+       'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
-stage2:
-       @echo ""
-       @echo "=====> Building $(NM) in chroot"
-       @echo ""
-       @if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
-        mv $(FILE) $(SRC) ; fi
-       @if [ ! -f $(SRC)/$(PATCH1) ] ; then $(WGET) $(URL1) && \
-        mv $(PATCH1) $(SRC) ; fi
-       @if [ ! -f /usr/bin/mktemp ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) 
&& \
-        patch -Np1 -i $(SRC)/$(PATCH1) && \
-        ./configure --prefix=/usr --with-libc && \
-        make -j3 && make install && make install-tempfile ; fi
-       @make clean
-        
+stage2: Makefile $(FILE) $(PATCH1)
+       @$(std_build)
+       @cp $(SRC)/{$(FILE),$(PATCH1)} $(LFSSRC)
 
+compile-stage2:
+       @$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+       @patch -Np1 -i ../$(PATCH1)
+       @./configure --prefix=/usr --with-libc >../$(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-tempfile >>../$(DIR)[EMAIL PROTECTED] 2>&1
+#
+#==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