Skip to content

Commit 2db8ba5

Browse files
authored
posix.mak: Fix make clean recipe (#3428)
1 parent 49bb360 commit 2db8ba5

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

posix.mak

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,8 @@ DOC_OUTPUT_DIR:=$(PWD)/web
166166
W:=$(DOC_OUTPUT_DIR)
167167
GIT_HOME=https://github.com/dlang
168168
DPL_DOCS_PATH=dpl-docs
169-
DPL_DOCS=$(DPL_DOCS_PATH)/dpl-docs --DRT-gcopt=parallel:0
169+
DPL_DOCS=$(DPL_DOCS_PATH)/dpl-docs
170+
DPL_DOCS_FLAGS=--DRT-gcopt=parallel:0
170171
REMOTE_DIR=d-programming@digitalmars.com:data
171172
TMP?=/tmp
172173
GENERATED=.generated
@@ -687,20 +688,20 @@ $(PHOBOS_LIB): $(DMD)
687688
apidocs-prerelease : $W/library-prerelease/sitemap.xml $W/library-prerelease/.htaccess
688689
apidocs-latest : $W/library/sitemap.xml $W/library/.htaccess
689690
apidocs-serve : $G/docs-prerelease.json
690-
${DPL_DOCS} serve-html --std-macros=html.ddoc --std-macros=dlang.org.ddoc --std-macros=std.ddoc --std-macros=macros.ddoc --std-macros=std-ddox.ddoc \
691+
${DPL_DOCS} ${DPL_DOCS_FLAGS} serve-html --std-macros=html.ddoc --std-macros=dlang.org.ddoc --std-macros=std.ddoc --std-macros=macros.ddoc --std-macros=std-ddox.ddoc \
691692
--override-macros=std-ddox-override.ddoc --package-order=std \
692693
--git-target=master --web-file-dir=. $<
693694

694695
$W/library-prerelease/sitemap.xml : $G/docs-prerelease.json
695696
@mkdir -p $(dir $@)
696-
${DPL_DOCS} generate-html --file-name-style=lowerUnderscored --std-macros=html.ddoc --std-macros=dlang.org.ddoc --std-macros=std.ddoc --std-macros=macros.ddoc --std-macros=std-ddox.ddoc \
697+
${DPL_DOCS} ${DPL_DOCS_FLAGS} generate-html --file-name-style=lowerUnderscored --std-macros=html.ddoc --std-macros=dlang.org.ddoc --std-macros=std.ddoc --std-macros=macros.ddoc --std-macros=std-ddox.ddoc \
697698
--override-macros=std-ddox-override.ddoc --package-order=std \
698699
--git-target=master $(DPL_DOCS_PATH_RUN_FLAGS) \
699700
$< $W/library-prerelease
700701

701702
$W/library/sitemap.xml : $G/docs-latest.json
702703
@mkdir -p $(dir $@)
703-
${DPL_DOCS} generate-html --file-name-style=lowerUnderscored --std-macros=html.ddoc --std-macros=dlang.org.ddoc --std-macros=std.ddoc --std-macros=macros.ddoc --std-macros=std-ddox.ddoc \
704+
${DPL_DOCS} ${DPL_DOCS_FLAGS} generate-html --file-name-style=lowerUnderscored --std-macros=html.ddoc --std-macros=dlang.org.ddoc --std-macros=std.ddoc --std-macros=macros.ddoc --std-macros=std-ddox.ddoc \
704705
--override-macros=std-ddox-override.ddoc --package-order=std \
705706
--git-target=v${LATEST} $(DPL_DOCS_PATH_RUN_FLAGS) \
706707
$< $W/library
@@ -724,7 +725,7 @@ $G/docs-latest.json : ${DMD_LATEST} ${DMD_LATEST_DIR} \
724725
${DMD_LATEST} -J$(DMD_LATEST_DIR)/src/dmd/res -J$(dir $(DMD_LATEST)) -c -o- -version=CoreDdoc \
725726
-version=MARS -version=CoreDdoc -version=StdDdoc -Df$G/.latest-dummy.html \
726727
-Xf$@ -I${PHOBOS_LATEST_DIR} @$G/.latest-files.txt
727-
${DPL_DOCS} filter $@ --min-protection=Protected \
728+
${DPL_DOCS} ${DPL_DOCS_FLAGS} filter $@ --min-protection=Protected \
728729
--only-documented $(MOD_EXCLUDES_LATEST)
729730
rm -f $G/.latest-files.txt $G/.latest-dummy.html
730731

@@ -738,7 +739,7 @@ $G/docs-prerelease.json : ${DMD} ${DMD_DIR} ${DRUNTIME_DIR} | dpl-docs
738739
${DMD} -J$(DMD_DIR)/res -J$(DMD_DIR)/compiler/src/dmd/res -J$(dir $(DMD)) -c -o- -version=MARS -version=CoreDdoc \
739740
-version=StdDdoc -Df$G/.prerelease-dummy.html \
740741
-Xf$@ -I${PHOBOS_DIR} @$G/.prerelease-files.txt
741-
${DPL_DOCS} filter $@ --min-protection=Protected \
742+
${DPL_DOCS} ${DPL_DOCS_FLAGS} filter $@ --min-protection=Protected \
742743
--only-documented $(MOD_EXCLUDES_PRERELEASE)
743744
rm -f $G/.prerelease-files.txt $G/.prerelease-dummy.html
744745

0 commit comments

Comments
 (0)