Merge pull request #2250 from wilzbach/fix-win32

Fix chmgen for Windows
merged-on-behalf-of: Vladimir Panteleev <github@thecybershadow.net>

Author: dlang-bot

chm-nav.dd

@@ -71,6 +71,7 @@ PACKAGE_NAME={"t":"$1"},
 CHANGELOG_VERSION_NIGHTLY=
 CHANGELOG_VERSION_PRE={"t":"$1","a":"$1_pre.html"},
 CHANGELOG_VERSION={"t":"$1","a":"$1.html"},
+CHANGELOG_VERSIONS=
 ESCAPES=/"/\"/
 ROOT_DIR=
 _=

win32.mak

@@ -6,6 +6,7 @@ LATEST=prerelease
 
 DMD=dmd
 DDOC=macros.ddoc html.ddoc dlang.org.ddoc windows.ddoc doc.ddoc $(NODATETIME)
+W=web
 
 CHMTARGETS=d.hhp d.hhc d.hhk d.chm
 HHC=$(ProgramFiles)\HTML Help Workshop\hhc.exe
@@ -18,7 +19,7 @@ chmgen.exe : chmgen.d
 	$(DMD) -g chmgen
 
 chm\d.hhp chm\d.hhc chm\d.hhk : chmgen.exe chm-nav-release.json $(TARGETS)
-	chmgen --target release
+	chmgen --root=$W --target release
 
 chm\d.chm : chm\d.hhp chm\d.hhc chm\d.hhk
 	-cmd /C "cd chm && "$(HHC)" d.hhp"
@@ -29,11 +30,6 @@ d.chm : chm\d.chm
 chm-nav-release.json : $(DDOC) std.ddoc spec\spec.ddoc modlist-release.ddoc changelog\changelog.ddoc chm-nav.dd
 	$(DMD) -o- -c -Df$@ $**
 
-d.tag : chmgen.exe $(TARGETS)
-	chmgen --only-tags
-
-d-tags.json : d.tag
-
 modlist-release.ddoc : modlist.d
 # need + to run as sub-cmd, redirect doesn't work otherwise
 	+$(DMD) -run modlist.d ..\druntime ..\phobos $(MOD_EXCLUDES_RELEASE) >$@