Import upstream version 0.11.1~r2837

3 files changed, 20 insertions, 8 deletions

diff --git a/infrastructure/makebuildenv.pl.in b/infrastructure/makebuildenv.pl.in
index 9f53e2c6..33b0b635 100755
--- a/infrastructure/makebuildenv.pl.in
+++ b/infrastructure/makebuildenv.pl.in
@@ -98,7 +98,11 @@ while(<FINDAUTOGEN>)
 				}
 				
 				# run command
-				die "Couldn't run command $c" unless (0 == system("(cd $dir; $c)"))
+				unless (0 == system("(cd $dir; $c)"))
+				{
+					die "Couldn't run command $c " .
+						"(in $dir) for $file";
+				}
 			}
 		}
 	}
diff --git a/infrastructure/makeparcels.pl.in b/infrastructure/makeparcels.pl.in
index 41dab287..4dc94925 100755
--- a/infrastructure/makeparcels.pl.in
+++ b/infrastructure/makeparcels.pl.in
@@ -132,8 +132,9 @@ my @clean_deps;
 
 for my $parcel (@parcels)
 {
-	my $target = BoxPlatform::parcel_target($parcel);
-	my $dir    = BoxPlatform::parcel_dir($parcel);
+	my $version = BoxPlatform::parcel_root($parcel);
+	my $target  = BoxPlatform::parcel_target($parcel);
+	my $dir     = BoxPlatform::parcel_dir($parcel);
 	my @parcel_deps;
 
 	unless ($target_windows)
@@ -288,13 +289,18 @@ EOF
 			($type,$name,$dest) = @args;
 		}
 
-
 		if ($type eq 'script')
 		{
 			# remove path from script name
 			$name =~ s{.*/}{};
 		}
 
+		if ($type eq 'html')
+		{
+			$dest = "share/doc/$version";
+			$name = "docs/$name.html";
+		}
+
 		if ($type eq 'man')
 		{
 			$name =~ /([0-9])$/;
diff --git a/infrastructure/mingw/configure.sh b/infrastructure/mingw/configure.sh
index f1ad353f..0486b20d 100755
--- a/infrastructure/mingw/configure.sh
+++ b/infrastructure/mingw/configure.sh
@@ -1,14 +1,16 @@
 #!/bin/sh
 
-if [ ! -r "/usr/i686-pc-mingw32/lib/libssl.a" ]; then
+DEP_PATH=/usr/i686-pc-mingw32
+
+if [ ! -r "$DEP_PATH/lib/libssl.a" ]; then
 	echo "Error: install OpenSSL as instructed by" \
 		"docs/backup/win32_build_on_cygwin_using_mingw.txt" >&2
 	exit 2
 fi
 
-if [ ! -r "/usr/lib/mingw/libpcreposix.a" \
-	-o ! -r "/usr/lib/mingw/libpcre.a" \
-	-o ! -r "/usr/include/mingw/pcreposix.h" ]; then
+if [ ! -r "$DEP_PATH/lib/libpcreposix.a" \
+	-o ! -r "$DEP_PATH/lib/libpcre.a" \
+	-o ! -r "$DEP_PATH/include/pcreposix.h" ]; then
 	echo "Error: install PCRE as instructed by" \
 		"docs/backup/win32_build_on_cygwin_using_mingw.txt" >&2
 	exit 2