aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore3
-rw-r--r--doc/manual/local.mk9
2 files changed, 3 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore
index ef0298417..1affd733d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,9 +12,10 @@ perl/Makefile.config
/libtool
# /doc/manual/
-/doc/manual/**/*.1
+/doc/manual/*.1
/doc/manual/*.5
/doc/manual/*.8
+/doc/manual/generated/*
/doc/manual/nix.json
/doc/manual/conf-file.json
/doc/manual/builtins.json
diff --git a/doc/manual/local.mk b/doc/manual/local.mk
index e2c732476..dd1d5f0fa 100644
--- a/doc/manual/local.mk
+++ b/doc/manual/local.mk
@@ -1,9 +1,5 @@
ifeq ($(doc_generate),yes)
-ALL_MD_FILES := $(call rwildcard, $(d)/src, *.md)
-GENERATED_MD_FILES := $(call rwildcard, $(d)/src/command-ref/new-cli, *.md)
-MANUAL_SRCS := $(filter-out $(GENERATED_MD_FILES), $(ALL_MD_FILES))
-
# Generate man pages.
man-pages := $(foreach n, \
nix-env.1 nix-build.1 nix-shell.1 nix-store.1 nix-instantiate.1 \
@@ -81,13 +77,10 @@ install: $(mandir)/man1/nix3-manpages
man: doc/manual/generated/man1/nix3-manpages
all: doc/manual/generated/man1/nix3-manpages
-$(mandir)/man1/nix3-manpages: doc/manual/generated/man1/nix3-build.1
+$(mandir)/man1/nix3-manpages: doc/manual/generated/man1/nix3-manpages
@mkdir -p $$(dirname $@)
$(trace-install) install -m 0644 $$(dirname $<)/* $$(dirname $@)
-# Technically this rule generates all the `nix3-*` manpages, but since we don’t
-# know their list statically and they are all generated at once anyways, we can
-# just be dirty and only track one
doc/manual/generated/man1/nix3-manpages: $(d)/src/command-ref/new-cli
@mkdir -p $$(dirname $@)
$(trace-gen) for i in doc/manual/src/command-ref/new-cli/*.md; do \