Libucw supports installation

[libucw.git] / ucw / perl / Configure.pm

diff --git a/ucw/perl/Configure.pm b/ucw/perl/Configure.pm
index 69fe3ea9ff4fa2ba90f5d4ce9fdb26f93803751f..e0f501d7caa96a7311b831ad8d31dc588216c16f 100644 (file)
--- a/ucw/perl/Configure.pm
+++ b/ucw/perl/Configure.pm
@@ -166,7 +166,9 @@ sub Finish() {
        } else {
                Log "Preparing for compilation from current directory to obj/ ... ";
        }
-       `rm -rf obj` if -d "obj"; Fail "Cannot delete old obj directory" if $?;
+       if (-d "obj") {
+               `rm -rf obj`; Fail "Cannot delete old obj directory" if $?;
+       }
        -d "obj" or mkdir("obj", 0777) or Fail "Cannot create obj directory: $!";
        -d "obj/ucw" or mkdir("obj/ucw", 0777) or Fail "Cannot create obj/ucw directory: $!";
        Log "done\n";
@@ -275,7 +277,7 @@ sub TrivConfig($@) {
        my $want = $opts{want};
        defined $want or $want = ["cflags", "libs"];
        for my $w (@$want) {
-               my $uw = $w; $uw =~ tr/a-z/A-Z/;
+               my $uw = $w; $uw =~ tr/a-z-/A-Z_/;
                my $cf = TryCmd("$pc --$w");
                Set("${upper}_${uw}" => $cf) if defined $cf;
        }