summaryrefslogtreecommitdiff
path: root/dh_installdocs
diff options
context:
space:
mode:
authorjoey <joey>2000-10-23 22:36:18 +0000
committerjoey <joey>2000-10-23 22:36:18 +0000
commit307194e33ae1856238c94a07818d9dfd4712f52f (patch)
tree81f5303697245412047cea4f4b42371c379f74f8 /dh_installdocs
parentd4cac755fed44798d07c5b598d8906e74d8e5293 (diff)
r378: * dh_movefiles: fixed a regexp quoting problem with --sourcedir.
Closes: #75434 * Whoops, I think I overwrote bod's NMU with 2.2.15. Let's merge those in: . debhelper (2.1.14-0.1) unstable; urgency=low . * Non-maintainer upload (thanks Joey). * dh_installchangelogs, dh_installdocs: allow dangling symlinks for $TMP/usr/share/doc/$PACKAGE (useful for multi-binary packages). Closes: #53381 . -- Brendan O'Dea <bod@debian.org> Fri, 20 Oct 2000 18:11:59 +1100 . I also added some documentation to debhelper.1 about this, and removed the TODO entry about it.
Diffstat (limited to 'dh_installdocs')
-rwxr-xr-xdh_installdocs25
1 files changed, 15 insertions, 10 deletions
diff --git a/dh_installdocs b/dh_installdocs
index 5a3ef70..7af3809 100755
--- a/dh_installdocs
+++ b/dh_installdocs
@@ -57,16 +57,21 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
}
}
- # Support debian/package.copyright, but if not present, fall back
- # on debian/copyright for all packages, not just the main binary
- # package.
- $copyright=pkgfile($PACKAGE,'copyright');
- if (! $copyright && -e "debian/copyright") {
- $copyright="debian/copyright";
- }
- if ($copyright) {
- doit("install","-g",0,"-o",0,"-m","644","-p",$copyright,
- "$TMP/usr/share/doc/$PACKAGE/copyright");
+ # If the "directory" is a dangling symlink, then don't install
+ # the copyright file. This is useful for multibinary packages
+ # that share a doc directory.
+ if (-d "$TMP/usr/share/doc/$PACKAGE") {
+ # Support debian/package.copyright, but if not present, fall
+ # back on debian/copyright for all packages, not just the
+ # main binary package.
+ $copyright=pkgfile($PACKAGE,'copyright');
+ if (! $copyright && -e "debian/copyright") {
+ $copyright="debian/copyright";
+ }
+ if ($copyright) {
+ doit("install","-g",0,"-o",0,"-m","644","-p",$copyright,
+ "$TMP/usr/share/doc/$PACKAGE/copyright");
+ }
}
# Add in the /usr/doc compatability symlinks code.