Skip to content

Commit a9ec072

Browse files
authored
Merge pull request #2071 from wilzbach/man-followup
Remove migration support code for previewing the generated man pages merged-on-behalf-of: Vladimir Panteleev <github@thecybershadow.net>
2 parents 281b776 + 7cbc2a5 commit a9ec072

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

posix.mak

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -975,16 +975,12 @@ $(DDOC_BIN): ddoc.d | $(STABLE_DMD)
975975
# This allows previewing changes to the automatically generated DMD man page
976976
################################################################################
977977

978-
$W/$(MAN_PAGE): $(DMD_DIR)/docs/gen_man.d $(DMD_DIR)/src/dmd/cli.d | ${STABLE_DMD}
978+
$(DMD_DIR)/generated/$(MAN_PAGE): $(DMD_DIR)/docs/gen_man.d $(DMD_DIR)/src/dmd/cli.d | ${STABLE_DMD}
979979
${MAKE} -C $(DMD_DIR)/docs DMD=$(abspath $(STABLE_DMD)) DIFFABLE=$(DIFFABLE) build
980-
# Remove the loop after https://github.com/dlang/dmd/pull/7637 has been merged
981-
for file in "$(DMD_DIR)/generated/$(MAN_PAGE)" "$(DMD_DIR)/$(MAN_PAGE)" ; do \
982-
if [ -f "$$file" ] ; then \
983-
mkdir -p $(dir $@); \
984-
cp $$file $@; \
985-
break; \
986-
fi \
987-
done
980+
981+
$W/$(MAN_PAGE): $(DMD_DIR)/generated/$(MAN_PAGE) | ${STABLE_DMD}
982+
mkdir -p $(dir $@)
983+
cp $< $@
988984
# CircleCi + nightlies.dlang.org might not have `man` installed
989985
if command -v man > /dev/null ; then \
990986
${MAKE} -s -C $(DMD_DIR)/docs DMD=$(abspath $(STABLE_DMD)) DIFFABLE=$(DIFFABLE) preview > $(dir $@)dmd.txt; \

0 commit comments

Comments
 (0)