summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile19
1 files changed, 10 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 1870a9a..70e6768 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-profiles = desktop
+maintopics = desktop
desktoptopics = email media mobile office scheduling web
lcdesktoptopics = email office web
lcgroups = all eu
@@ -6,13 +6,14 @@ desktoptopiclists = $(patsubst %,profiles/desktop-%,$(desktoptopics))
desktoptopiclcgrouplists = $(foreach topic,$(lcdesktoptopics),\
profiles/desktop-$(topic)-%)
desktoptweaks = tweaks/base tweaks/desktop
-basefiles = $(patsubst %,content/%/base/preseed.cfg,$(profiles))
+basefiles = $(patsubst %,content/%/base/preseed.cfg,$(maintopics))
topicfiles = $(patsubst %,content/desktop/%/preseed.cfg,$(desktoptopics))
lcgroupfiles = $(foreach lcgroup,$(lcgroups),\
$(patsubst %,content/desktop/%-$(lcgroup)/preseed.cfg,$(lcdesktoptopics)))
-mainfiles = $(patsubst %,content/%/preseed.cfg,$(profiles))
+mainfiles = $(patsubst %,content/%/preseed.cfg,$(maintopics))
mainlcgroupfiles = $(patsubst %,content/desktop/%/preseed.cfg,$(lcgroups))
-allfiles = $(basefiles) $(topicfiles) $(lcgroupfiles) $(mainfiles) $(mainlcgroupfiles)
+profiles-di = $(basefiles) $(topicfiles) $(lcgroupfiles) $(mainfiles) $(mainlcgroupfiles)
+profiles = $(profiles-di)
mdfiles = content/MD5SUMS
shafiles = $(patsubst %,content/SHA%SUMS,1 256 512)
checksumfiles = $(mdfiles) $(shafiles)
@@ -37,13 +38,13 @@ $(mainfiles): content/%/preseed.cfg : skel/preseed.cfg.in profiles/% $(desktopto
$(mainlcgroupfiles): content/desktop/%/preseed.cfg : skel/preseed.cfg.in profiles/desktop $(desktoptopiclists) $(desktoptopiclcgrouplists) profiles/desktop-z $(desktoptweaks)
bin/pkglist2preseed $(filter skel/%,$^) $@ "$(filter profiles/%,$^)" "$(filter tweaks/%,$^)"
-$(mdfiles): content/MD%SUMS: $(allfiles)
- cd content && md$*sum $(allfiles:content/%=%) > MD$*SUMS~
+$(mdfiles): content/MD%SUMS: $(profiles)
+ cd content && md$*sum $(profiles:content/%=%) > MD$*SUMS~
rm -f $@.sign
mv -f $@~ $@
-$(shafiles): content/SHA%SUMS: $(allfiles)
- cd content && sha$*sum $(allfiles:content/%=%) > SHA$*SUMS~
+$(shafiles): content/SHA%SUMS: $(profiles)
+ cd content && sha$*sum $(profiles:content/%=%) > SHA$*SUMS~
rm -f $@.sign
mv -f $@~ $@
@@ -55,4 +56,4 @@ $(info): content/% : %
cp -f $< $@
clean:
- rm -f $(allfiles) $(info) $(checksumfiles) $(signfiles)
+ rm -f $(profiles) $(info) $(checksumfiles) $(signfiles)