blob: 580962327b2ebd2a8e62f79756b88e4d97764708 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
diff --git a/ucw/perl/UCW/Configure/C.pm b/ucw/perl/UCW/Configure/C.pm
index 730b5145..2c5dfd25 100644
--- a/ucw/perl/UCW/Configure/C.pm
+++ b/ucw/perl/UCW/Configure/C.pm
@@ -128,7 +128,7 @@ Set("CWARNS" => '-Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototy
Set("CWARNS_OFF" => '');
# Linker flags
-Set("LOPT" => "");
+Set("LOPT" => "") unless IsSet("LOPT");
# Extra libraries
Set("LIBS" => "");
diff --git a/ucw/perl/UCW/Configure/Paths.pm b/ucw/perl/UCW/Configure/Paths.pm
index d03c90d6..e90b0b5d 100644
--- a/ucw/perl/UCW/Configure/Paths.pm
+++ b/ucw/perl/UCW/Configure/Paths.pm
@@ -36,7 +36,7 @@ if (IsSet("CONFIG_LOCAL")) {
}
Set('CONFIG_DIR', 'etc') unless IsSet('CONFIG_DIR');
-Set('INSTALL_CONFIG_DIR', Get('INSTALL_PREFIX') . Get('CONFIG_DIR'));
+Set('INSTALL_CONFIG_DIR', Get('CONFIG_DIR'));
Set('INSTALL_BIN_DIR', Get('INSTALL_USR_PREFIX') . 'bin');
Set('INSTALL_SBIN_DIR', Get('INSTALL_USR_PREFIX') . 'sbin');
Set('INSTALL_LIB_DIR', Get('INSTALL_USR_PREFIX') . 'lib');
diff --git a/ucw/threads.c b/ucw/threads.c
index d9100119..2a907682 100644
--- a/ucw/threads.c
+++ b/ucw/threads.c
@@ -19,7 +19,7 @@
#include <sys/syscall.h>
#include <unistd.h>
#ifdef __NR_gettid
-static pid_t
+pid_t
gettid(void)
{
return syscall(__NR_gettid);
|