[Git][haskell-team/haskell-devscripts][master] 2 commits: Fix install locations for generalized temporary destination forders.

[Felix Lechner (@lechner)]

Felix Lechner pushed to branch master at Debian Haskell Group / haskell-devscripts


Commits:
ba11e8ef by Felix Lechner at 2022-04-11T13:29:32-07:00
Fix install locations for generalized temporary destination forders.

- - - - -
f5be885d by Felix Lechner at 2022-04-11T13:30:49-07:00
Release version 0.16.8 into unstable.

- - - - -


2 changed files:

- debian/changelog
- lib/Debian/Debhelper/Buildsystem/Haskell/Recipes.pm


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+haskell-devscripts (0.16.8) unstable; urgency=medium
+
+  * Fix install locations for generalized temporary destination forders.
+
+ -- Felix Lechner <felix.lechner at lease-up.com>  Mon, 11 Apr 2022 13:30:35 -0700
+
 haskell-devscripts (0.16.7) unstable; urgency=medium
 
   * Call install_recipe via Perl hook; encode_utf8 was incorrect for the


=====================================
lib/Debian/Debhelper/Buildsystem/Haskell/Recipes.pm
=====================================
@@ -934,11 +934,11 @@ sub install_recipe {
             run(qw{mkdir --parents}, $libdir);
             run(
                 'find',
-                $libdir,
+                "./$libdir",
                 qw{ ( ! -name *_p.a ! -name *.p_hi ! -type d ) },
-                qw{-exec install -Dm 644},
+                qw{-exec install -D --mode=644},
                 '{}',
-                "../$installable/{}",
+                "$savedir/debian/$installable/{}",
                 $SEMICOLON
             );
 
@@ -960,7 +960,7 @@ sub install_recipe {
                   if length $ENV{HASKELL_HIDE_PACKAGES};
 
                 my $pkgdir = package_pkgdir($installable);
-                run(qw{install -Dm 644},
+                run(qw{install -D --mode=644},
                     $pkg_config, "debian/$installable/$pkgdir/$pkg_config");
                 run(qw{rm -f}, $pkg_config);
 
@@ -991,10 +991,13 @@ sub install_recipe {
 
             run(qw{mkdir --parents}, $libdir);
             run(
-                'find', $libdir,
+                'find',
+                "./$libdir",
                 qw{ ( -name *_p.a -o -name *.p_hi ) },
-                qw{-exec install -Dm 644},
-                '{}', "../$installable/{}", $SEMICOLON
+                qw{-exec install -D --mode=644},
+                '{}',
+                "$savedir/debian/$installable/{}",
+                $SEMICOLON
             );
 
             chdir($savedir)
@@ -1009,12 +1012,15 @@ sub install_recipe {
 
             my $htmldir = hc_htmldir($compiler, $ENV{CABAL_PACKAGE});
 
-            run(qw{mkdir --parents}, "debian/$installable/$htmldir");
+            run(qw{mkdir --parents}, $htmldir);
             run(
-                'find', "./$htmldir",
+                'find',
+                "./$htmldir",
                 qw{ ! -name *.haddock ! -type d},
-                qw{-exec install -Dm 644},
-                '{}', "../$installable/{}", $SEMICOLON
+                qw{-exec install -D --mode=644},
+                '{}',
+                "$savedir/debian/$installable/{}",
+                $SEMICOLON
             );
 
             chdir($savedir)
@@ -1042,8 +1048,8 @@ sub install_recipe {
                   = "debian/$installable/$htmldir/$ENV{CABAL_PACKAGE}.txt";
                 if (-e $target) {
 
-                    my $hoogle = "/usr/lib/$compiler-doc/hoogle/";
-                    my $name = "debian/$installable$hoogle$installable.txt";
+                    my $hoogle = "usr/lib/$compiler-doc/hoogle/";
+                    my $name = "debian/$installable/$hoogle$installable.txt";
 
                     run(qw{mkdir --parents}, dirname($name));
                     run(qw{ln --symbolic --relative --no-target-directory},



View it on GitLab: https://salsa.debian.org/haskell-team/haskell-devscripts/-/compare/88dc8611af206a4391cab4161194cd19358be390...f5be885dcba6c4c96bc03bb83bddd4cb4313d4d5

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/haskell-devscripts/-/compare/88dc8611af206a4391cab4161194cd19358be390...f5be885dcba6c4c96bc03bb83bddd4cb4313d4d5
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20220411/b4e3f5c2/attachment-0001.htm>