X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh_installcatalogs;h=b33f897e863985941fe6242ca4237fafbaf7a3c6;hb=e2a6d4cec4a7ee952cf6a7f250d80f1d75a38f95;hp=fdaf0fa7609b73d28bd4b020c9ad654dab697d65;hpb=8e45bd46faedcb37e7fc7e9b51c9fec149fc8f33;p=debhelper.git

diff --git a/dh_installcatalogs b/dh_installcatalogs
index fdaf0fa..b33f897 100755
--- a/dh_installcatalogs
+++ b/dh_installcatalogs
@@ -17,28 +17,35 @@ B<dh_installcatalogs> [S<I<debhelper options>>] [B<-n>]
 
 =head1 DESCRIPTION
 
-dh_installcatalog is a debhelper program that installs and
-registers SGML catalogs. (Note: it will be extended for XML catalog
-registration when xml-core is available.)  It complies with the Debian
-XML/SGML policy.
-
-The file F<debian/I<package>.sgmlcatalogs> contains the catalogs to be
-installed per package.  Each line in that file should be of the form
-C<source dest>, where C<source> indicates where the catalog resides in
-the source tree, and C<dest> indicates the destination location for
-the catalog under the package build area.  C<dest> should start with
-F</usr/share/sgml/>.
+B<dh_installcatalogs> is a debhelper program that installs and
+registers SGML catalogs. It complies with the Debian XML/SGML policy.
 
 Catalogs will be registered in a supercatalog, in
 F</etc/sgml/I<package>.cat>.
 
 This command automatically adds maintainer script snippets for
-registering and unregistering the catalogs and "supercatalogs" (unless
-B<-n> is used).  A dependancy on B<sgml-base> will be added to
-C<${misc:Depends}>, so be sure your package uses that variable in
-F<debian/control>.  See L<dh_installdeb(1)> for an explantion of
+registering and unregistering the catalogs and supercatalogs (unless
+B<-n> is used). These snippets are inserted into the maintainer scripts
+by B<dh_installdeb>; see L<dh_installdeb(1)> for an explanation of
 Debhelper maintainer script snippets.
 
+A dependency on B<sgml-base> will be added to B<${misc:Depends}>, so be
+sure your package uses that variable in F<debian/control>.
+
+=head1 FILES
+
+=over 4
+
+=item debian/I<package>.sgmlcatalogs
+
+Lists the catalogs to be installed per package. Each line in that file
+should be of the form C<I<source> I<dest>>, where I<source> indicates where the
+catalog resides in the source tree, and I<dest> indicates the destination
+location for the catalog under the package build area. I<dest> should
+start with F</usr/share/sgml/>.
+
+=back
+
 =head1 OPTIONS
 
 =over 4
@@ -51,7 +58,7 @@ Do not modify F<postinst>/F<postrm>/F<prerm> scripts.
 
 =head1 NOTES
 
-Note that this command is not idempotent. "dh_clean -k" should be
+Note that this command is not idempotent. L<dh_prep(1)> should be
 called between invocations of this command. Otherwise, it may cause
 multiple instances of the same text to be added to maintainer scripts.
 
@@ -74,7 +81,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 			$fulldest =~ s|//|/|g; # beautification
 	
 			if (! -d dirname($fulldest)) {
-				doit("install","-d","-m755",dirname($dest));
+				doit("install","-d","-m755",$tmpdir."/".dirname($dest));
 			}
 
 			doit("install","-p","-m644",$source,$fulldest);
@@ -85,6 +92,10 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	if (@sgmlinstalled) {
 		addsubstvar($package, "misc:Depends", "sgml-base", ">= $sgmlbasever");
 
+		if (! -d "$tmpdir/etc/sgml") {
+			doit("install","-d","-m755","$tmpdir/etc/sgml");
+		}
+
 		if (! $dh{NOSCRIPTS}) {
 			my $ordcats = join(" ", @sgmlinstalled);
 			my $centralcat = "/etc/sgml/$package.cat";