From 422377c35652c640d4c22c3204eb5a8de7c70417 Mon Sep 17 00:00:00 2001
From: "Alan T. DeKok" <aland@freeradius.org>
Date: Wed, 6 Feb 2019 11:23:55 -0500
Subject: [PATCH] use `doc/raddb/` instead of `asciidoci/` for output

---
 .gitignore     |  4 ----
 Makefile       | 20 ++++++++++----------
 doc/.gitignore |  1 +
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index a2355707cf47..91b274efb138 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,7 +71,3 @@ appendonly*.aof
 
 # Local scripts
 run.sh
-
-# Doc directory
-asciidoc
-
diff --git a/Makefile b/Makefile
index d03d2e8b1d03..78da1b0bf7b8 100644
--- a/Makefile
+++ b/Makefile
@@ -340,10 +340,10 @@ whitespace:
 	@perl -p -i -e 'trim' $$(git ls-files src/)
 
 CONF_FILES := $(filter-out %~,$(wildcard raddb/*conf raddb/mods-available/* raddb/sites-available/* raddb/dictionary))
-ADOC_FILES := $(patsubst raddb/%,asciidoc/%.adoc,$(CONF_FILES))
-ADOC_FILES += $(patsubst raddb/%.md,asciidoc/%.adoc,$(shell find raddb -name "*\.md" -print))
-PDF_FILES := $(patsubst asciidoc/%.adoc,asciidoc/%.pdf,$(ADOC_FILES))
-HTML_FILES := $(patsubst asciidoc/%.adoc,asciidoc/%.html,$(ADOC_FILES))
+ADOC_FILES := $(patsubst raddb/%,doc/raddb/%.adoc,$(CONF_FILES))
+ADOC_FILES += $(patsubst raddb/%.md,doc/raddb/%.adoc,$(shell find raddb -name "*\.md" -print))
+PDF_FILES := $(patsubst doc/raddb/%.adoc,doc/raddb/%.pdf,$(ADOC_FILES))
+HTML_FILES := $(patsubst doc/raddb/%.adoc,doc/raddb/%.html,$(ADOC_FILES))
 
 #
 #  Pandoc v2 onwards renamed --latex-engine to --pdf-engine
@@ -362,7 +362,7 @@ endif
 #  format to read/write than asciidoc.  But we want a consistent "look
 #  and feel" for the documents, so we make all of them asciidoc.
 #
-asciidoc/%.adoc: raddb/%.md
+doc/raddb/%.adoc: raddb/%.md
 	@echo PANDOC $^
 	@mkdir -p $(dir $@)
 	@pandoc --filter=scripts/asciidoc/pandoc-filter -w asciidoc -o $@ $^
@@ -370,16 +370,16 @@ asciidoc/%.adoc: raddb/%.md
 #
 #  Conf files get converted to Asciidoc via our own magic script.
 #
-asciidoc/%.adoc: raddb/%
+doc/raddb/%.adoc: raddb/%
 	@echo ADOC $^
 	@mkdir -p $(dir $@)
 	@./scripts/asciidoc/conf2adoc -a ${top_srcdir}/asciidoc -o $@ < $^
 
-asciidoc/%.html: asciidoc/%.adoc
+doc/%.html: doc/%.adoc
 	@echo HTML $^
 	@asciidoctor $< -b html5 -o $@ $<
 
-asciidoc/%.pdf: asciidoc/%.adoc
+doc/%.pdf: doc/%.adoc
 	@echo PDF $^
 	@asciidoctor $< -b docbook5 -o - | \
 		pandoc -f docbook -t latex --${PANDOC_ENGINE}-engine=xelatex \
@@ -387,7 +387,7 @@ asciidoc/%.pdf: asciidoc/%.adoc
 			-V images=yes \
 			--template=./scripts/asciidoc/freeradius.template -o $@
 
-asciidoc/%.pdf: raddb/%.md
+doc/%.pdf: doc/%.md
 	@echo PDF $^
 	pandoc -f markdown -t latex --${PANDOC_ENGINE}-engine=xelatex \
 		-V papersize=letter \
@@ -403,4 +403,4 @@ pdf: $(PDF_FILES)
 #
 clean: clean.asciidoc
 clean.asciidoc:
-	@rm -rf asciidoc
+	@rm -f $(ADOC_FILES) $(HTML_FILES) $(PDF_FILES)
diff --git a/doc/.gitignore b/doc/.gitignore
index e35d8850c968..2f9e7f24f0d2 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1 +1,2 @@
 _build
+*.html