From: Alan T. DeKok Date: Tue, 12 Aug 2025 11:06:31 +0000 (-0400) Subject: use macro for common name X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=859614834281c5041416c2aa8b92151deabc6499;p=thirdparty%2Ffreeradius-server.git use macro for common name --- diff --git a/doc/all.mk b/doc/all.mk index c09f22301e3..0d836f841bd 100644 --- a/doc/all.mk +++ b/doc/all.mk @@ -63,11 +63,13 @@ install: install.doc clean: clean.doc +DOC_RADDB := doc/antora/modules/reference/pages/raddb + # # Our "conf to asciidoc" stuff. # CONF_FILES := $(filter-out %~,$(wildcard raddb/*conf raddb/mods-available/* raddb/sites-available/* raddb/dictionary)) -BASE_ADOC_FILES := $(wildcard doc/*.adoc doc/*/*.adoc doc/*/*/*.adoc) doc/antora/modules/reference/pages/raddb/mods-available/all_modules.adoc +BASE_ADOC_FILES := $(wildcard doc/*.adoc doc/*/*.adoc doc/*/*/*.adoc) $(DOC_RADDB)/mods-available/all_modules.adoc ADOC_FILES := $(BASE_ADOC_FILES) $(AUTO_ADOC_FILES) @@ -191,7 +193,7 @@ endif # # Conf files get converted to Asciidoc via our own magic script. # -doc/antora/modules/reference/pages/raddb/%.adoc: raddb/% +$(DOC_RADDB)/%.adoc: raddb/% @echo ADOC $^ ${Q}mkdir -p $(dir $@) ${Q}perl -pi -e 's/^# ([^ \t])/# $$1/;s/^([ \t]+)# ([^ \t])/$$1# $$2/;s/[ \t]+$$//' $^ @@ -201,7 +203,7 @@ doc/antora/modules/reference/pages/raddb/%.adoc: raddb/% # Simple rule for lazy people. # .PHONY: doc.raddb -doc.raddb: $(patsubst raddb/%,doc/antora/modules/reference/pages/raddb/%.adoc,$(CONF_FILES)) +doc.raddb: $(patsubst raddb/%,$(DOC_RADDB)/%.adoc,$(CONF_FILES)) # # We re-run antora if any of the input files change. Antora can't do partial updates. @@ -238,7 +240,7 @@ doc/%.adoc: doc/%.md # # Conf files get converted to Asciidoc via our own magic script. # -doc/antora/modules/reference/pages/raddb/%.adoc: raddb/% +$(DOC_RADDB)/%.adoc: raddb/% @echo ADOC $^ ${Q}mkdir -p $(dir $@) ${Q}perl -pi -e 's/^# ([^ \t])/# $$1/;s/^([ \t]+)# ([^ \t])/$$1# $$2/;s/[ \t]+$$//' $^ @@ -249,7 +251,7 @@ doc/antora/modules/reference/pages/raddb/%.adoc: raddb/% # IGNORE_MODULES := $(patsubst %,src/modules/%/README.md,rlm_dict rlm_securid rlm_sigtran rlm_test) README_MODULES := $(filter-out $(IGNORE_MODULES), $(wildcard src/modules/rlm_*/README.md)) -doc/antora/modules/reference/pages/raddb/mods-available/all_modules.adoc: $(README_MODULES) +$(DOC_RADDB)/mods-available/all_modules.adoc: $(README_MODULES) @echo ADOC mods-available/all_modules.adoc ${Q}./scripts/asciidoc/mod_readme2adoc $(README_MODULES) > $@ endif