summaryrefslogtreecommitdiff
path: root/dh_install
diff options
context:
space:
mode:
authorjoey <joey>2002-05-19 03:06:41 +0000
committerjoey <joey>2002-05-19 03:06:41 +0000
commit6acd7f22222118dc5f51c251bd0078edbe280e87 (patch)
tree141f8d946118eb548ad6e19b6a62dd63bf398763 /dh_install
parent822faec6d81321d23b3e75c018f0308fd006d1b2 (diff)
r522: * Set DH_ALWAYS_EXCLUDE=CVS and debhelper will exclude CVS directories
from processing by any command that takes a -X option, and dh_builddeb will also go in and rm -rf any that still sneak into the build tree. * dh_install: A patch from Eric Dorland <eric@debian.org> adds support for --sourcedir, which allows debian/package.files files to be moved over to debian/package.install, and just work. Closes: #146847 * dh_movefiles: don't do file tests in no-act mode. Closes: #144573 * dh_installdebconf: pass --drop-old-templates to debconf-mergetemplate. Means debhelper has to depend on debconf-utils 1.1.1.
Diffstat (limited to 'dh_install')
-rwxr-xr-xdh_install17
1 files changed, 17 insertions, 0 deletions
diff --git a/dh_install b/dh_install
index 019d0f1..4aa7142 100755
--- a/dh_install
+++ b/dh_install
@@ -65,6 +65,18 @@ Note that if you list only a filename on a line by itself in a
debian/package.install file, with no explicit destination, then dh_install
will automatically guess the destination even if this flag is not set.
+=item B<--sourcedir=dir>
+
+Makes all source files relative to "dir". If this is specified, it is akin
+to all the source files having "dir" prepended to them. By default, "dir"
+is '.'.
+
+To make dh_install behave like the old dh_movefiles, move your
+package.files file to package.install and call dh_install with
+"--sourcedir=debian/tmp" appended to the command. This will
+approximate dh_movefiles behaviour, except it will copy files instead
+of moving them.
+
=item I<file [...] dest>
Lists files (or directories) to install and where to install them to.
@@ -81,12 +93,15 @@ my $ret=0;
foreach my $package (@{$dh{DOPACKAGES}}) {
my $tmp=tmpdir($package);
my $file=pkgfile($package,"install");
+ my $srcdir = '.';
my @install;
if ($file) {
@install=filedoublearray($file); # no globbing yet
}
+ $srcdir = $dh{SOURCEDIR} if defined $dh{SOURCEDIR};
+
if (($package eq $dh{FIRSTPACKAGE} || $dh{PARAMS_ALL}) && @ARGV) {
push @install, [@ARGV];
}
@@ -114,6 +129,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
$dest=dirname($dest);
}
+ $src = "$srcdir/$src"; # do this now, to avoid the parsing above
+
# Make sure the destination directory exists.
if (! -e "$tmp/$dest") {
doit("install","-d","$tmp/$dest");