summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2014-03-03 17:22:06 +0100
committerJonas Smedegaard <dr@jones.dk>2014-03-03 17:22:06 +0100
commit9e56df5e615112003ff721e0246f746f0478556a (patch)
tree51881f8779989e58657ffcd27553c54445cd3757 /Makefile
parent60ccbc221e90f9509c022540c5e3c78efa671656 (diff)
Fix register dependencies on skeleton and tweaks in makefile.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 6dd6bef..91a3735 100644
--- a/Makefile
+++ b/Makefile
@@ -14,14 +14,14 @@ signfiles = $(patsubst %,%.sign,$(checksumfiles))
all: $(checksumfiles)
sign: $(signfiles)
-$(basefiles): content/%/base/preseed.cfg : profiles/% profiles/%-z
- bin/pkglist2preseed skel/preseed.cfg.in $@ "$^" "$(desktoptweaks)"
+$(basefiles): content/%/base/preseed.cfg : skel/preseed.cfg.in profiles/% profiles/%-z $(desktoptweaks)
+ bin/pkglist2preseed $(filter skel/%,$^) $@ "$(filter profiles/%,$^)" "$(filter tweaks/%,$^)"
-$(topicfiles): content/desktop/%/preseed.cfg : profiles/desktop profiles/desktop-% profiles/desktop-z
- bin/pkglist2preseed skel/preseed.cfg.in $@ "$^" "$(desktoptweaks)"
+$(topicfiles): content/desktop/%/preseed.cfg : skel/preseed.cfg.in profiles/desktop profiles/desktop-% profiles/desktop-z $(desktoptweaks)
+ bin/pkglist2preseed $(filter skel/%,$^) $@ "$(filter profiles/%,$^)" "$(filter tweaks/%,$^)"
-$(mainfiles): content/%/preseed.cfg : profiles/% profiles/%-email $(desktoptopiclists) profiles/%-z
- bin/pkglist2preseed skel/preseed.cfg.in $@ "$^" "$(desktoptweaks)"
+$(mainfiles): content/%/preseed.cfg : skel/preseed.cfg.in profiles/% profiles/%-email $(desktoptopiclists) profiles/%-z $(desktoptweaks)
+ bin/pkglist2preseed $(filter skel/%,$^) $@ "$(filter profiles/%,$^)" "$(filter tweaks/%,$^)"
$(mdfiles): content/MD%SUMS: $(allfiles)
cd content && md$*sum $(allfiles:content/%=%) > MD$*SUMS~