Merge branch 'fix-vcxproj-after-2.17.0'

Fix a couple of issues with the Visual Studio project generation which
were partially caused by the rebase to Git v2.17.0 (and partially only
detected because of the breakage).

config.mak.uname

@@ -746,8 +746,8 @@ vcxproj:
 	git add -f $(SCRIPT_LIB) $(SCRIPT_SH_GEN) $(SCRIPT_PERL_GEN)
 
 	# Add Perl module
-	$(MAKE) -C perl
-	git add -f perl/blib/lib
+	$(MAKE) $(LIB_PERL_GEN)
+	git add -f perl/build
 
 	# Add bin-wrappers, for testing
 	rm -rf bin-wrappers/

contrib/buildsystems/Generators/Vcxproj.pm

@@ -74,8 +74,8 @@ sub createProject {
     $cflags =~ s/</&lt;/g;
     $cflags =~ s/>/&gt;/g;
 
-    my $libs_release = '';
-    my $libs_debug = '';
+    my $libs_release = "\n    ";
+    my $libs_debug = "\n    ";
     if (!$static_library) {
       $libs_release = join(";", sort(grep /^(?!libgit\.lib|xdiff\/lib\.lib|vcs-svn\/lib\.lib)/, @{$$build_structure{"$prefix${name}_LIBS"}}));
       $libs_debug = $libs_release;
@@ -227,7 +227,7 @@ EOM
     print F << "EOM";
   </ItemGroup>
 EOM
-    if (!$static_library || $target eq 'vcs-svn') {
+    if (!$static_library || $target =~ 'vcs-svn') {
       my $uuid_libgit = $$build_structure{"LIBS_libgit_GUID"};
       my $uuid_xdiff_lib = $$build_structure{"LIBS_xdiff/lib_GUID"};