Author: jhuntwork Date: 2005-07-18 20:58:21 -0600 (Mon, 18 Jul 2005) New Revision: 374
Modified: x86/trunk/packages/template/Makefile Log: Changes to template Makefile to reflect changes in functions Modified: x86/trunk/packages/template/Makefile =================================================================== --- x86/trunk/packages/template/Makefile 2005-07-19 02:54:34 UTC (rev 373) +++ x86/trunk/packages/template/Makefile 2005-07-19 02:58:21 UTC (rev 374) @@ -4,26 +4,21 @@ NM= [package-name] VRS= [version-number] DIR= $(NM)-$(VRS) + FILE= $(DIR).tar.bz2 # Use bz2 files wherever possible, especially for lfs-base -SHA= [sha1sum of $(FILE)] -URL= $(HTTP)/$(NM)/$(FILE) +URL-$(FILE)= $(HTTP)/$(NM)/$(FILE) +SHA-$(FILE)= [sha1sum of $(FILE)] PATCH1= $(DIR)-some-1.patch -SHA1= [sha1sum of $(PATCH1) -PATCHURL= http://www.linuxfromscratch.org/patches/downloads/$(NM)/$(PATCH) +URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/downloads/$(NM)/$(PATCH1) +SHA-$(PATCH1)= [sha1sum of $(PATCH1) # Targets # ============================================================================= include $(ROOT)/scripts/functions -$(FILE): - $(call download,$(FILE),$(URL),$(SHA)) - -$(PATCH1): - $(call download,$(PATCH1),$(URL1),$(SHA1)) - -stage1: Makefile $(FILE) +stage1: $(FILE) @$(std_build) # See the scripts/functions file for functions like this @cp $(SRC)/$(FILE) $(LFSSRC) # Copy LFS-Base packages to safe location @@ -32,7 +27,6 @@ #============================================================================== # Configure commands below \/ #============================================================================== - @$(sep_dir) # Simple function to create a separate build directory @./configure --prefix=$(WD) >../$(DIR)[EMAIL PROTECTED] 2>&1 # #==Status Messages========================================== @@ -80,7 +74,7 @@ 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)' stage2: Makefile $(FILE) $(PATCH1) - @$(std_build) + @$(sep_dir_build) # Simple function to create a separate build directory compile-stage2: @$(call echo_message, Configuring) -- http://linuxfromscratch.org/mailman/listinfo/livecd FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
