Fix typo in French translation, about debian/package.README.Debian files.

[debhelper.git] / dh_installexamples

diff --git a/dh_installexamples b/dh_installexamples
index 0f3651cfa85c68dd5277164219ffbd89c038ce9a..3e5e0893faac5e17d390661a6363ecaf10e42232 100755 (executable)
--- a/dh_installexamples
+++ b/dh_installexamples
@@ -80,16 +80,18 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                
                my $exclude = '';
                if ($dh{EXCLUDE_FIND}) {
-                       $exclude = ' -and ! \( '.$dh{EXCLUDE_FIND}.' \)';
+                       $exclude .= ' -and ! \( '.$dh{EXCLUDE_FIND}.' \)';
                }
                
                foreach my $example (@examples) {
                        next if excludefile($example);
                        if (-d $example && $exclude) {
-                               my ($dir_basename) = basename($example);
+                               my $basename = basename($example);
+                               my $dir = ($basename eq '.') ? $example : "$example/..";
                                my $pwd=`pwd`;
                                chomp $pwd;
-                               complex_doit("cd '$example/..' && find '$dir_basename' -type f$exclude -exec cp --parents -dp {} $pwd/$tmp/usr/share/doc/$package/examples \\;");
+                               my $exclude2 = '-type f'.$exclude;
+                               complex_doit("cd '$dir' && find '$basename' -type f$exclude -exec cp --parents -dp {} $pwd/$tmp/usr/share/doc/$package/examples \\;");
                        }
                        else {
                                doit("cp", "-a", $example, "$tmp/usr/share/doc/$package/examples");