dh_prep: New program, does the same as dh_clean -k (which will be deprecated later).

[debhelper.git] / dh_installcatalogs

diff --git a/dh_installcatalogs b/dh_installcatalogs
index fdaf0fa7609b73d28bd4b020c9ad654dab697d65..e7ead755e71c17094c55e53e1e383865ebf350db 100755 (executable)
--- a/dh_installcatalogs
+++ b/dh_installcatalogs
@@ -17,7 +17,7 @@ B<dh_installcatalogs> [S<I<debhelper options>>] [B<-n>]
 
 =head1 DESCRIPTION
 
-dh_installcatalog is a debhelper program that installs and
+dh_installcatalogs 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.
@@ -34,11 +34,13 @@ 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
+B<-n> is used). These snippets are inserted into the maintainer scripts
+by 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 C<${misc:Depends}>, so be
+sure your package uses that variable in F<debian/control>.
+
 =head1 OPTIONS
 
 =over 4
@@ -51,7 +53,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 +76,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 +87,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";