From 28c222377418af5058cef00b40f8d6e8a17baeb0 Mon Sep 17 00:00:00 2001 From: CleverMouse Date: Thu, 20 Jan 2011 10:24:51 +0000 Subject: [PATCH] fix in english makefile for nasm - 2 git-svn-id: svn://kolibrios.org@1758 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/eng/Makefile | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/data/eng/Makefile b/data/eng/Makefile index c07427e5d2..e16d00a717 100644 --- a/data/eng/Makefile +++ b/data/eng/Makefile @@ -321,14 +321,13 @@ File\ Managers/.dir: # FASM black magic goes to Makefile.fasm. include Makefile.fasm -# Rule for copying files is simpler, but similar to previous. -define copy_meta_rule -$(1): $(2) Makefile $$(call respace,$$(addsuffix .dir,$(3))) - cp $$< "$$@" -endef -$(foreach f,$(COPY_FILES),$(eval $(call copy_meta_rule,$(fbinary),$(fsource),$(binarydir)))) +# Similar for NASM. +include Makefile.nasm -# Special rules for copying sysfuncs.txt. +# Similar for copying files. +include Makefile.copy + +# Special rules for copying sysfuncs.txt - it isn't directly included in the image. docpak: $(DOCDIR)SYSFUNCS.TXT $(wildcard $(DOCDIR)*) $(DOCDIR)SYSFUNCS.TXT: $(KERNEL)/docs/sysfuncs.txt cp $(KERNEL)/docs/sysfuncs.txt $(DOCDIR)SYSFUNCS.TXT