r1620: * dh_installcatalogs: Fixed to create dir in tmpdir. Closes: #218237

[debhelper.git] / dh_install

diff --git a/dh_install b/dh_install
index d75e02537640da0acd357fc527d6a9f971b09ed7..779b9d6e73564033aa3b63d5c840a16654cff801 100755 (executable)
--- a/dh_install
+++ b/dh_install
@@ -12,7 +12,7 @@ use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
 
-B<dh_install> [B<-X>I<item>] [B<--autodest>] [B<--list-missing>] [B<--sourcedir=>I<dir>] [S<I<debhelper options>>] [S<I<file [...] dest>>]
+B<dh_install> [B<-X>I<item>] [B<--autodest>] [B<--sourcedir=>I<dir>] [S<I<debhelper options>>] [S<I<file [...] dest>>]
 
 =head1 DESCRIPTION
 
@@ -25,9 +25,9 @@ else, for which no particular intelligence is needed. It is a replacement for
 the old dh_movefiles command.
 
 Files named debian/package.install list the files to install into each
-package and where they should be installed to. The format is a set of
-lines, where each line lists a file or files to install, and at the end of
-the line tells the directory it should be installed in. The name of the
+package and the directory they should be installed to. The format is a set
+of lines, where each line lists a file or files to install, and at the end
+of the line tells the directory it should be installed in. The name of the
 files (or directories) to install should be given relative to the current
 directory, while the installation directory is given relative to the
 package build directory. You may use wildcards in the names of the files to
@@ -36,8 +36,8 @@ install (in v3 mode and above).
 This program may be used in one of two ways. If you just have a file or two
 that the upstream Makefile does not install for you, you can run dh_install
 on them to move them into place. On the other hand, maybe you have a large
-package that builds multiple binary packages. You can use the upstream Makefile
-to install it all into debian/tmp, and then use dh_install to copy
+package that builds multiple binary packages. You can use the upstream
+Makefile to install it all into debian/tmp, and then use dh_install to copy
 directories and files from there into the proper package build directories.
 
 =head1 OPTIONS
@@ -79,6 +79,11 @@ you don't miss installing newly added files in new upstream releases.
 Note that files that are excluded from being moved via the -X option are not
 warned about.
 
+=item B<--fail-missing>
+
+This option is like --list-missing, except if a file was missed, it will
+not only list the missing files, but also fail with a nonzero exit code. 
+
 =item B<--sourcedir=dir>
 
 Makes all source files be found under dir. If this is specified, it is
@@ -122,11 +127,12 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
        # Support for -X flag.
        my $exclude = '';
        if ($dh{EXCLUDE_FIND}) {
-               $exclude = '-and ! \( '.$dh{EXCLUDE_FIND}.' \)';
+               $exclude = '! \( '.$dh{EXCLUDE_FIND}.' \)';
        }
        
        foreach my $set (@install) {
                my $dest;
+               my $tmpdest=0;
                
                if (! defined $dh{AUTODEST} && @$set > 1) {
                        $dest=pop @$set;
@@ -144,6 +150,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                                }
                                $dest=~s/^(.*\/)?\Q$strip\E//;
                                $dest=dirname($dest);
+                               $tmpdest=1;
                        }
                        
                        # Make sure the destination directory exists.
@@ -152,7 +159,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                        }
 
                        # Keep track of what's installed.
-                       if ($dh{LIST_MISSING}) {
+                       if ($dh{LIST_MISSING} || $dh{FAIL_MISSING}) {
                                # Kill any extra slashes. Makes the
                                # @installed stuff more robust.
                                $src=~y:/:/:s;
@@ -166,17 +173,23 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                                # Pity there's no cp --exclude ..
                                my $pwd=`pwd`;
                                chomp $pwd;
-                               complex_doit("cd $src/.. && find $dir_basename \\( -type f -or -type l \\) $exclude -exec cp --parents -dp {} $pwd/$tmp/$dest/ \\;");
+                               complex_doit("cd $src/.. && find $dir_basename $exclude \\( -type f -or -type l \\) -exec cp --parents -dp {} $pwd/$tmp/$dest/ \\;");
+                               # cp is annoying so I need a separate pass
+                               # just for empty directories
+                               complex_doit("cd $src/.. && find $dir_basename $exclude \\( -type d -and -empty \\) -exec cp --parents -a {} $pwd/$tmp/$dest/ \\;");
                        }
                        else {
                                doit("cp", "-a", $src, "$tmp/$dest/");
                        }
+
+                       if ($tmpdest) {
+                               $dest=undef;
+                       }
                }
        }
 }
 
-if ($dh{LIST_MISSING}) {
-       
+if ($dh{LIST_MISSING} || $dh{FAIL_MISSING}) {
        # . as srcdir makes no sense, so this is a special case.
        if ($srcdir eq '.') {
                $srcdir='debian/tmp';
@@ -191,7 +204,10 @@ if ($dh{LIST_MISSING}) {
                push @missing, $_ unless /$installed/ || excludefile($_);
        }, $srcdir);
        if (@missing) {
-               warning "$_ not installed" foreach @missing;
+               warning "$_ exists in debian/tmp but not installed to anywhere" foreach @missing;
+               if ($dh{FAIL_MISSING}) {
+                       error("missing files, aborting");
+               }
        }
 }
 
@@ -216,9 +232,15 @@ If you want a libfoo-dev package too, debian/libfoo-dev.install might contain:
   usr/lib/libfoo*.so
   usr/share/man/man3
 
+=head1 LIMITATIONS
+
+dh_install cannot rename files or directories, it can only install them
+with the names they already have into wherever you want in the package
+build tree.
+  
 =head1 SEE ALSO
 
-L<debhelper(1)>
+L<debhelper(7)>
 
 This program is a part of debhelper.