From 8946c6ad43d5a36cf08d94e7f202c5d910a69211 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Mon, 3 Mar 2014 11:01:37 +0100 Subject: Separate tweaks from skeleton file. Fix syntax of tweak functions (code inside {} must end with ; ). --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 813f019..9bb6e84 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ profiles = desktop desktoptopics = email office web desktoptopiclists = $(patsubst %,profiles/desktop-%,$(desktoptopics)) +desktoptweaks = tweaks/base tweaks/desktop basefiles = $(patsubst %,content/%/base/preseed.cfg,$(profiles)) topicfiles = $(patsubst %,content/desktop/%/preseed.cfg,$(desktoptopics)) mainfiles = $(patsubst %,content/%/preseed.cfg,$(profiles)) @@ -14,13 +15,13 @@ all: $(checksumfiles) sign: $(signfiles) $(basefiles): content/%/base/preseed.cfg : profiles/% profiles/%-z - bin/pkglist2preseed skel/preseed.cfg.in $@ $^ + bin/pkglist2preseed skel/preseed.cfg.in $@ "$^" "$(desktoptweaks)" $(topicfiles): content/desktop/%/preseed.cfg : profiles/desktop profiles/desktop-% profiles/desktop-z - bin/pkglist2preseed skel/preseed.cfg.in $@ $^ + bin/pkglist2preseed skel/preseed.cfg.in $@ "$^" "$(desktoptweaks)" $(mainfiles): content/%/preseed.cfg : profiles/% profiles/%-email $(desktoptopiclists) profiles/%-z - bin/pkglist2preseed skel/preseed.cfg.in $@ $^ + bin/pkglist2preseed skel/preseed.cfg.in $@ "$^" "$(desktoptweaks)" $(mdfiles): content/MD%SUMS: $(allfiles) cd content && md$*sum $(allfiles:content/%=%) > MD$*SUMS~ -- cgit v1.2.3