Fix build system auto-selection breakage.

[debhelper.git] / dh_makeshlibs

diff --git a/dh_makeshlibs b/dh_makeshlibs
index 7da87b32e46ff8bae5299d9a6808fbfdec1ce2ff..03a54f95420d3d990f39ef14c962863730608f18 100755 (executable)
--- a/dh_makeshlibs
+++ b/dh_makeshlibs
@@ -21,10 +21,19 @@ libraries, and generates a shlibs file for the libraries it finds.
 It also adds a call to ldconfig in the postinst and postrm scripts (in
 V3 mode and above only) to any packages in which it finds shared libraries.
 
-If a L<dpkg-gensymbols(1)> symbol file is found in debian/package.symbols
-(or debian/package.symbols.arch), dpkg-gensymbols will be called
-to process and install the symbols file. Packages using symbols files
-should Build-Depend on dpkg-dev (>= 1.14.8).
+=head1 FILES
+
+=over 4
+
+=item debian/I<package>.symbols
+
+=item debian/I<package>.symbols.I<arch>
+
+These symbols files, if present, are passed to L<dpkg-gensymbols(1)> to
+be processed and installed. Use the I<arch> specific names if you need
+to provide different symbols files for different architectures.
+
+=back
 
 =head1 OPTIONS
 
@@ -105,7 +114,12 @@ Generates a shlibs file that looks something like:
 
 =cut
 
-init();
+init(options => {
+       "m=s", => \$dh{M_PARAMS},
+       "major=s" => \$dh{M_PARAMS},
+       "version-info:s" => \$dh{V_FLAG},
+       "add-udeb=s" => \$dh{SHLIBS_UDEB},
+});
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
        next if is_udeb($package);
@@ -208,15 +222,11 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
        # dpkg-gensymbols files
        my $symbols=pkgfile($package, "symbols");
        if (-e $symbols) {
-               # This is done rather than using dpkg-gensymbols
+               # -I is used rather than using dpkg-gensymbols
                # own search for symbols files, since that search
                # is not 100% compatible with debhelper. (For example,
                # this supports --ignore being used.)
-               if (! -d "$tmp/DEBIAN") {
-                       doit("install","-d","$tmp/DEBIAN");
-               }
-               doit("cp", $symbols, "$tmp/DEBIAN/symbols");
-               doit("dpkg-gensymbols", "-p$package", "-O$tmp/DEBIAN/symbols",
+               doit("dpkg-gensymbols", "-p$package", "-I$symbols",
                        "-P$tmp", @{$dh{U_PARAMS}});
                if (-s "$tmp/DEBIAN/symbols" == 0) {
                        doit("rm", "-f", "$tmp/DEBIAN/symbols");