X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh_strip;h=57c45f5c7e5a9786091da07ea450381219c4975a;hb=e2a6d4cec4a7ee952cf6a7f250d80f1d75a38f95;hp=ae1594fead8c324b132f47d3a405104fc3935467;hpb=eb955ef0dafe25ac1cb8091c8f2a065d68e18916;p=debhelper.git

diff --git a/dh_strip b/dh_strip
index ae1594f..57c45f5 100755
--- a/dh_strip
+++ b/dh_strip
@@ -161,7 +161,14 @@ sub make_debug {
 	return unless get_file_type($file) =~ /not stripped/;
 
 	my ($base_file)=$file=~/^\Q$tmp\E(.*)/;
-	my $debug_path=$desttmp."/usr/lib/debug/".$base_file;
+	my $debug_path;
+	if (! compat(8) && 
+	    `readelf -n $file`=~ /^\s+Build ID: ([0-9a-f]{2})([0-9a-f]+)$/m) {
+		$debug_path=$desttmp."/usr/lib/debug/.build-id/$1/$2.debug"
+	}
+	else {
+		$debug_path=$desttmp."/usr/lib/debug/".$base_file;
+	}
 	my $debug_dir=dirname($debug_path);
 	if (! -d $debug_dir) {
 		doit("install", "-d", $debug_dir);
@@ -170,7 +177,7 @@ sub make_debug {
 		doit($objcopy, "--only-keep-debug", $file, $debug_path);
 	}
 	else {
-		doit($objcopy, "--only-keep-debug --compress-debug-sections", $file, $debug_path);
+		doit($objcopy, "--only-keep-debug", "--compress-debug-sections", $file, $debug_path);
 	}
 	# No reason for this to be executable.
 	doit("chmod", 644, $debug_path);