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
40
41
42
43
44
45
46
47
48
49
50
|
Description: make $ACE_ROOT/bin/m{w,p}c.pl relocatable
$ACE_ROOT/bin/m{w,p}c.pl look up for MPC modules under its base path, in
$ACE_ROOT/bin/MakeProjectCreator. But we package those scripts under /usr/bin,
while MakeProjectCreator folder is put under $ACE_ROOT/bin (in other words,
/usr/lib/ace/bin)
.
This patch sets MPC path dir to use $ACE_ROOT if defined (used when building
ACE+TAO packages), or /usr/lib/ace if not.
Forwarded: not-needed
Author: Thomas Girard <thomas.g.girard@free.fr>
Last-Update: 2011-07-24
--- a/bin/mpc.pl
+++ b/bin/mpc.pl
@@ -20,13 +20,9 @@
use File::Spec;
use File::Basename;
-my($basePath) = (defined $FindBin::RealBin ? $FindBin::RealBin :
- File::Spec->rel2abs(dirname($0)));
-if ($^O eq 'VMS') {
- $basePath = File::Spec->rel2abs(dirname($0)) if ($basePath eq '');
- $basePath = VMS::Filespec::unixify($basePath);
-}
-$basePath .= '/MakeProjectCreator';
+my($aceroot) = $ENV{ACE_ROOT};
+my($basePath) = (defined $aceroot ?
+ $aceroot : '/usr/lib/ace') . '/bin/MakeProjectCreator';
my($mpcroot) = $ENV{MPC_ROOT};
my($mpcpath) = (defined $mpcroot ? $mpcroot :
--- a/bin/mwc.pl
+++ b/bin/mwc.pl
@@ -20,13 +20,9 @@
use File::Spec;
use File::Basename;
-my($basePath) = (defined $FindBin::RealBin ? $FindBin::RealBin :
- File::Spec->rel2abs(dirname($0)));
-if ($^O eq 'VMS') {
- $basePath = File::Spec->rel2abs(dirname($0)) if ($basePath eq '');
- $basePath = VMS::Filespec::unixify($basePath);
-}
-$basePath .= '/MakeProjectCreator';
+my($aceroot) = $ENV{ACE_ROOT};
+my($basePath) = (defined $aceroot ?
+ $aceroot : '/usr/lib/ace') . '/bin/MakeProjectCreator';
my($mpcroot) = $ENV{MPC_ROOT};
my($mpcpath) = (defined $mpcroot ? $mpcroot :
|
