summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2014-03-03 11:01:37 +0100
committerJonas Smedegaard <dr@jones.dk>2014-03-03 11:01:37 +0100
commit8946c6ad43d5a36cf08d94e7f202c5d910a69211 (patch)
tree5a2a343e95b69f9dc20c9c32827affce0c75a8bc /Makefile
parent7dc24d5c4a76c444972f66e844d7faa7132dda22 (diff)
Separate tweaks from skeleton file. Fix syntax of tweak functions (code inside {} must end with ; ).
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 4 insertions, 3 deletions
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~