diff --git a/Makefile b/Makefile index 7514b9a..5f83f43 100644 --- a/Makefile +++ b/Makefile @@ -39,13 +39,13 @@ $(MAKEPAGES): make-pages/*.hs make-pages/make-pages.cabal find dist-newstyle -name make-pages -executable -type f \ -exec cp {} $@ \; -$(TMPDIR)/galleries.d: $(DATADIR)/galleries.yaml $(DATADIR) $(MAKEPAGES) +$(TMPDIR)/galleries.mk: $(DATADIR)/galleries.yaml $(DATADIR) $(MAKEPAGES) echo "[deps] "$@ mkdir -p $(dir $@) $(MAKEPAGES) $(MPFLAGS) depend-gallery $< -o $@ \ -B $(BUILDDIR) -D $(DATADIR) -T $(TMPDIR) -I $(INFONAME) --include $(TMPDIR)/galleries.d +-include $(TMPDIR)/galleries.mk .PHONY: clean distclean clean: diff --git a/make-pages/Depend.hs b/make-pages/Depend.hs index 69d0dee..3ee9438 100644 --- a/make-pages/Depend.hs +++ b/make-pages/Depend.hs @@ -53,7 +53,7 @@ dependGallery' (GalleryInfo {title, prefix, filters}) infos' build data_ tmp = pages' = unwords pages path = build prefix "index.html" rules = makeRules prefix filters build data_ tmp - inc d = tmp prefix takeDirectory d <.> "d" + inc d = tmp prefix takeDirectory d <.> "mk" incs = if null infos then "" else "include " <> fromString (unwords $ map inc files) index = build "index.html" @@ -83,7 +83,7 @@ makeRules prefix filters build data_ tmp = [b|@0 mkdir -p $$(dir $$@) $$(MAKEPAGES) $$(MPFLAGS) single "$$<" -o "$$@" $flags - $@tmpPrefix/%.d: $@data_/%/info.yaml + $@tmpPrefix/%.mk: $@data_/%/info.yaml echo "[deps] "$$@ mkdir -p $$(dir $$@) $$(MAKEPAGES) $$(MPFLAGS) depend-single $flags \