summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog6
-rwxr-xr-xdh_illumos_make6
2 files changed, 10 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 175acdf..cbea5e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dh-illumos (9.5.1) unstable; urgency=low
+
+ * Fix shell syntax.
+
+ -- Igor Pashev <pashev.igor@gmail.com> Mon, 05 Nov 2012 07:15:21 +0400
+
dh-illumos (9.5) unstable; urgency=low
* dh_illumos_gate:
diff --git a/dh_illumos_make b/dh_illumos_make
index c2290b3..3e1fce4 100755
--- a/dh_illumos_make
+++ b/dh_illumos_make
@@ -135,9 +135,11 @@ $override .= ' CTFMERGE=:' if $dh{'WITHOUT_CTF'};
if ($dh{'NATIVE'}) {
my $deb_host_arch_cpu = `dpkg-architecture -qDEB_HOST_ARCH_CPU`;
+ chomp $deb_host_arch_cpu;
$override .= ' i386_XARCH=';
- $override .= " LDLIBS32='\$(LDLIBS_NATIVE)'";
- $override .= " MAPFILE.NGB='\$(MAPFILE.NGB_$deb_host_arch_cpu)'";
+ # We need to propogate it through perl and shell to make:
+ $override .= " LDLIBS32='\\\$(LDLIBS_NATIVE)'";
+ $override .= " MAPFILE.NGB='\\\$(MAPFILE.NGB_$deb_host_arch_cpu)'";
}
foreach (@dirs) {