various post-release win32 fixups

Reini Urban · Reini Urban · commit 609ab5740c7e · 2016-05-02T11:55:44.000+02:00
installperl, installhtml, appveyor
diff --git a/appveyor.yml b/appveyor.yml
@@ -43,7 +43,7 @@ deploy_script:
 - cmd: >-
     if "%MSVC_VERSION%" == "10" exit /b
     nmake install CCTYPE=MSVC120 USE_NO_REGISTRY=define
-    C:\cperl\usr\bin\cperlivp
+    C:\cperl\bin\cperlivp
     7z a -y -sfx cperl-%APPVEYOR_REPO_TAG_NAME%-win%PLATFORM%.exe c:\cperl\
     del /s /f /q C:\cperl
 
diff --git a/installperl b/installperl
@@ -261,7 +261,7 @@ if (($Is_W32 and ! $Is_NetWare) or $Is_Cygwin) {
     if ($Is_Cygwin) {
 	$perldll = $libperl;
     } else {
-	$perldll = 'perl5'.$Config{patchlevel}.'.'.$so;
+	$perldll = ($Config{usecperl} ? 'c' : '') . 'perl5'.$Config{patchlevel}.'.'.$so;
     }
 
     if ($dlsrc ne "dl_none.xs") {
diff --git a/win32/Makefile b/win32/Makefile
@@ -1185,7 +1185,8 @@ Extensions_realclean:
 
 #-------------------------------------------------------------------------------
 
-doc: $(PERLEXE) ..\pod\perltoc.pod
+doc:
+	$(PERLEXE) -f ..\pod\buildtoc -q
 	$(PERLEXE) ..\installhtml --podroot=.. --htmldir=$(HTMLDIR) \
 	    --podpath=pod:lib:utils --htmlroot="file://$(INST_HTML::=|)" \
 	    --recurse

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ if (($Is_W32 and ! $Is_NetWare) or $Is_Cygwin) {`
`261`	`261`	`if ($Is_Cygwin) {`
`262`	`262`	`$perldll = $libperl;`
`263`	`263`	`} else {`
`264`		`- $perldll = 'perl5'.$Config{patchlevel}.'.'.$so;`
	`264`	`+ $perldll = ($Config{usecperl} ? 'c' : '') . 'perl5'.$Config{patchlevel}.'.'.$so;`
`265`	`265`	`}`
`266`	`266`
`267`	`267`	`if ($dlsrc ne "dl_none.xs") {`