Set DEB_[USR]LIBDIR_{32|64} vars in env.sh

2 files changed, 14 insertions, 9 deletions

diff --git a/debian/changelog b/debian/changelog
index ba0f92d..e966346 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ dh-illumos (9) UNRELEASED; urgency=low
     cause dh_strip used to delete it. Also this avoid additional
     build dependency on "mcs" utility.
   * Use versioned tarballs (e. g. illumos-source-2.10) 
+  * Set DEB_[USR]LIBDIR_{32|64} vars in env.sh
 
  -- Igor Pashev <pashev.igor@gmail.com>  Mon, 01 Oct 2012 04:57:33 +0400
 
diff --git a/dh_illumos_gate b/dh_illumos_gate
index 458c3a3..7620c05 100755
--- a/dh_illumos_gate
+++ b/dh_illumos_gate
@@ -128,16 +128,16 @@ my $bits = `dpkg-architecture -qDEB_HOST_ARCH_BITS`;
 chomp $bits;
 
 # In illumos source 32-bit binaries are default
-my ($libdir, $libdir64, $usrlibdir, $usrlibdir64);
+my ($libdir32, $libdir64, $usrlibdir32, $usrlibdir64);
 
 if ($bits == 64) {
-    $libdir      = "lib32";
-    $usrlibdir   = "usr/$libdir";
+    $libdir32    = "lib32";
+    $usrlibdir32 = "usr/$libdir32";
     $libdir64    = "lib/$multiarch";
     $usrlibdir64 = "usr/$libdir64";
 } else {
-    $libdir      = "lib/$multiarch";
-    $usrlibdir   = "usr/$libdir";
+    $libdir32    = "lib/$multiarch";
+    $usrlibdir32 = "usr/$libdir32";
     $libdir64    = "lib64";
     $usrlibdir64 = "usr/$libdir64";
 }
@@ -184,9 +184,9 @@ if (-f $Makefile_lib) {
         ', $Makefile_lib
     );
     doit('sed', '-r', '-i', "
-        s,^(ROOTFS_LIBDIR)\\s*=.*,\\1=\$(ROOT)/$libdir,;
+        s,^(ROOTFS_LIBDIR)\\s*=.*,\\1=\$(ROOT)/$libdir32,;
         s,^(ROOTFS_LIBDIR64)\\s*=.*,\\1=\$(ROOT)/$libdir64,;
-        s,^(ROOTLIBDIR)\\s*=.*,\\1=\$(ROOT)/$usrlibdir,;
+        s,^(ROOTLIBDIR)\\s*=.*,\\1=\$(ROOT)/$usrlibdir32,;
         s,^(ROOTLIBDIR64)\\s*=.*,\\1=\$(ROOT)/$usrlibdir64,;
         ", $Makefile_lib
     );
@@ -245,8 +245,12 @@ if (open (ENV, '>', $env)) {
     print ENV "export LEX='/usr/bin/flex -l'\n";
     print ENV "export STRIP=':'\n";
     print ENV "export MCS=':'\n";
-    print ENV "export LDLIBS32=\"-YP,\$ROOT/$libdir:\$ROOT/$usrlibdir\"\n";
-    print ENV "export LDLIBS64=\"-YP,\$ROOT/$libdir64:\$ROOT/$usrlibdir64\"\n";
+    print ENV "export DEB_LIBDIR_32='/$libdir32'\n";
+    print ENV "export DEB_USRLIBDIR_32='/$usrlibdir32'\n";
+    print ENV "export DEB_LIBDIR_64='/$libdir64'\n";
+    print ENV "export DEB_USRLIBDIR_64='/$usrlibdir64'\n";
+    print ENV "export LDLIBS32=\"-YP,\$ROOT/\$DEB_LIBDIR_32:\$ROOT/\$DEB_USRLIBDIR_32\"\n";
+    print ENV "export LDLIBS64=\"-YP,\$ROOT/\$DEB_LIBDIR_64:\$ROOT/\$DEB_USRLIBDIR_64\"\n";
     print ENV 'export LDLIBS_NATIVE="', ($bits == 64) ? '$LDLIBS64' : '$LDLIBS32', "\"\n";
 
     close(ENV);