X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh_install;h=fad3d92226c4e96177deda9215d53cacc92cad46;hb=18a0da8092ea9f3dc48bca92b36f592af25a608d;hp=1748fc23fbeeec6a630ea1b7a07d90b18cfaf9f2;hpb=0952ac2e9995da8abe149f3e42b3b8d9d2797112;p=debhelper.git

diff --git a/dh_install b/dh_install
index 1748fc2..fad3d92 100755
--- 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<--sourcedir=>I<dir>] [S<I<debhelper options>>] [S<I<file> ... I<dest>>]
+B<dh_install> [B<-X>I<item>] [B<--autodest>] [B<--sourcedir=>I<dir>] [S<I<debhelper options>>] [S<I<file|dir> ... I<destdir>>]
 
 =head1 DESCRIPTION
 
@@ -49,6 +49,11 @@ 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 install (in v3 mode and above).
 
+Note that if you list exactly one filename or wildcard-pattern on a line by
+itself, with no explicit destination, then B<dh_install>
+will automatically guess the destination to use, the same as if the
+--autodest option were used.
+
 =back
 
 =head1 OPTIONS
@@ -85,7 +90,6 @@ Look in the specified directory for files to be installed.
 Note that this is not the same as the B<--sourcedirectory> option used
 by the B<dh_auto_>I<*> commands. You rarely need to use this option, since
 B<dh_install> automatically looks for files in F<debian/tmp> in debhelper
-
 compatibility level 7 and above.
 
 =item B<--autodest>
@@ -101,12 +105,7 @@ filename. So if the filename is F<debian/tmp/usr/bin>, then that directory
 will be copied to F<debian/package/usr/>. If the filename is
 F<debian/tmp/etc/passwd>, it will be copied to F<debian/package/etc/>.
 
-Note that if you list exactly one filename or wildcard-pattern on a line by
-itself in a
-F<debian/package.install> file, with no explicit destination, then B<dh_install>
-will automatically guess the destination even if this flag is not set.
-
-=item I<file> ... I<dest>
+=item I<file|dir> ... I<destdir>
 
 Lists files (or directories) to install and where to install them to.
 The files will be installed into the first package F<dh_install> acts on.
@@ -138,7 +137,7 @@ foreach my $package (getpackages()) {
 
 	my @install;
 	if ($file) {
-		@install=filedoublearray($file); # no globbing yet
+		@install=filedoublearray($file); # no globbing here; done below
 	}
 	
 	if (($package eq $dh{FIRSTPACKAGE} || $dh{PARAMS_ALL}) && @ARGV) {
@@ -250,27 +249,6 @@ if ($dh{LIST_MISSING} || $dh{FAIL_MISSING}) {
 	}
 }
 
-=head1 EXAMPLE
-
-Suppose your package's upstream F<Makefile> installs a binary, a man page, and
-a library into appropriate subdirectories of F<debian/tmp>. You want to put
-the library into package libfoo, and the rest into package foo. Your rules
-file will run "B<dh_install --sourcedir=debian/tmp>". Make F<debian/foo.install>
-contain:
-
-  usr/bin
-  usr/share/man/man1
-
-While F<debian/libfoo.install> contains:
-
-  usr/lib/libfoo*.so.*
-
-If you want a libfoo-dev package too, F<debian/libfoo-dev.install> might contain:
-
-  usr/include
-  usr/lib/libfoo*.so
-  usr/share/man/man3
-
 =head1 LIMITATIONS
 
 B<dh_install> cannot rename files or directories, it can only install them