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
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
|
--- src/OpenDDS/DDS_TAOv2.mwc.1
+++ src/OpenDDS/DDS_TAOv2.mwc
@@ -24,7 +24,6 @@ workspace {
dds
tools
java
- DevGuideExamples
exclude {
java/jms
--- src/OpenDDS/dds/DdsDcps.mpc
+++ src/OpenDDS/dds/DdsDcps.mpc
@@ -80,15 +80,10 @@ project(OpenDDS_Dcps): core, coverage_optional, \
../rules.dds.GNU
}
- InstallData_Files {
- gendir = bin
- ../bin/PerlDDS
- }
-
verbatim(gnuace, postinstall) {
-" echo export DDS_ROOT=$(DESTDIR)$(INSTALL_PREFIX)/share/dds> $(DESTDIR)$(INSTALL_PREFIX)/share/dds/dds-devel.sh"
+" echo export DDS_ROOT=$(INSTALL_PREFIX)/share/dds> $(DESTDIR)$(INSTALL_PREFIX)/share/dds/dds-devel.sh"
" @$(MKDIR) $(DESTDIR)$(INSTALL_PREFIX)/share/dds/dds"
-" ln -sf $(DESTDIR)$(INSTALL_PREFIX)/include/dds/Version.h $(DESTDIR)$(INSTALL_PREFIX)/share/dds/dds"
+" ln -sf $(INSTALL_PREFIX)/include/dds/Version.h $(DESTDIR)$(INSTALL_PREFIX)/share/dds/dds"
" cp $(DDS_ROOT)/user_macros.GNU $(DESTDIR)$(INSTALL_PREFIX)/share/dds $(ACE_NUL_STDERR)"
" @$(MKDIR) $(DESTDIR)$(INSTALL_PREFIX)/$(INSTALL_LIB)/cmake/OpenDDS"
" cp $(DDS_ROOT)/cmake/*.cmake $(DESTDIR)$(INSTALL_PREFIX)/$(INSTALL_LIB)/cmake/OpenDDS"
--- src/OpenDDS/dds/idl/opendds_idl.mpc
+++ src/OpenDDS/dds/idl/opendds_idl.mpc
@@ -35,7 +35,7 @@ project: aceexe, dds_macros, crosscompile, install {
verbatim(gnuace, postinstall) {
" @$(MKDIR) $(DESTDIR)$(INSTALL_PREFIX)/share/dds/bin"
-" ln -sf $(DESTDIR)$(INSTALL_PREFIX)/bin/opendds_idl $(DESTDIR)$(INSTALL_PREFIX)/share/dds/bin"
+" ln -sf $(INSTALL_PREFIX)/bin/opendds_idl $(DESTDIR)$(INSTALL_PREFIX)/share/dds/bin"
}
}
--- src/OpenDDS/java/dds/dcps_java.mpc
+++ src/OpenDDS/java/dds/dcps_java.mpc
@@ -112,6 +112,6 @@ project: idl2jni, javah, dcpslib, optional_jni_check, dcps_java_optional, dcps_t
" cp $(DDS_ROOT)/lib/OpenDDS_DCPS.jar $(INSTALL_PREFIX)/lib"
" perl -pi -e 's!\\$$[(]DDS_ROOT[)]/lib!$(INSTALL_PREFIX)/lib!g' $(DESTDIR)$(INSTALL_PREFIX)/share/dds/MPC/config/idl2jni.mpb"
" perl -pi -e 's!\\$$[(]DDS_ROOT[)]/lib!$(INSTALL_PREFIX)/lib!g' $(DESTDIR)$(INSTALL_PREFIX)/share/dds/MPC/config/dcps_java.mpb"
-" rm $(INSTALL_PREFIX)/dds/*.idl && rmdir $(INSTALL_PREFIX)/dds"
+" rm $(DESTDIR)$(INSTALL_PREFIX)/dds/*.idl && rmdir $(DESTDIR)$(INSTALL_PREFIX)/dds"
}
}
--- src/OpenDDS/java/dds/dcps_java.mpc
+++ src/OpenDDS/java/dds/dcps_java.mpc
@@ -109,7 +109,7 @@ project: idl2jni, javah, dcpslib, optional_jni_check, dcps_java_optional, dcps_t
}
verbatim(gnuace, postinstall) {
-" cp $(DDS_ROOT)/lib/OpenDDS_DCPS.jar $(INSTALL_PREFIX)/lib"
+" cp $(DDS_ROOT)/lib/OpenDDS_DCPS.jar $(DESTDIR)$(INSTALL_PREFIX)/lib"
" perl -pi -e 's!\\$$[(]DDS_ROOT[)]/lib!$(INSTALL_PREFIX)/lib!g' $(DESTDIR)$(INSTALL_PREFIX)/share/dds/MPC/config/idl2jni.mpb"
" perl -pi -e 's!\\$$[(]DDS_ROOT[)]/lib!$(INSTALL_PREFIX)/lib!g' $(DESTDIR)$(INSTALL_PREFIX)/share/dds/MPC/config/dcps_java.mpb"
" rm $(DESTDIR)$(INSTALL_PREFIX)/dds/*.idl && rmdir $(DESTDIR)$(INSTALL_PREFIX)/dds"
--- src/OpenDDS/java/idl2jni/codegen/idl2jni_codegen.mpc
+++ src/OpenDDS/java/idl2jni/codegen/idl2jni_codegen.mpc
@@ -22,7 +22,7 @@ project: aceexe, crosscompile, dds_macros, install {
}
verbatim(gnuace, postinstall) {
-" @$(MKDIR) $(INSTALL_PREFIX)/share/dds/bin"
-" ln -sf $(INSTALL_PREFIX)/bin/idl2jni $(INSTALL_PREFIX)/share/dds/bin"
+" @$(MKDIR) $(DESTDIR)$(INSTALL_PREFIX)/share/dds/bin"
+" ln -sf $(INSTALL_PREFIX)/bin/idl2jni $(DESTDIR)$(INSTALL_PREFIX)/share/dds/bin"
}
}
--- src/OpenDDS/java/idl2jni/compact/idl2jni_compact.mpc
+++ src/OpenDDS/java/idl2jni/compact/idl2jni_compact.mpc
@@ -13,6 +13,6 @@ project: java, dds_macros, install {
}
verbatim(gnuace, postinstall) {
-" cp $(DDS_ROOT)/lib/i2jrt_compact.jar $(INSTALL_PREFIX)/lib"
+" cp $(DDS_ROOT)/lib/i2jrt_compact.jar $(DESTDIR)$(INSTALL_PREFIX)/lib"
}
}
--- src/OpenDDS/java/idl2jni/runtime/idl2jni_runtime.mpc
+++ src/OpenDDS/java/idl2jni/runtime/idl2jni_runtime.mpc
@@ -24,9 +24,9 @@ project: taolib, java, javah, optional_jni_check, dds_macros, i2jrt_optional, in
}
verbatim(gnuace, postinstall) {
-" cp $(DDS_ROOT)/lib/i2jrt.jar $(INSTALL_PREFIX)/lib"
-" @$(MKDIR) $(INSTALL_PREFIX)/share/dds/java/build_scripts"
-" cp ../../build_scripts/java?_wrapper.pl $(INSTALL_PREFIX)/share/dds/java/build_scripts"
-" cp *.h $(INSTALL_PREFIX)/share/dds/java"
+" cp $(DDS_ROOT)/lib/i2jrt.jar $(DESTDIR)$(INSTALL_PREFIX)/lib"
+" @$(MKDIR) $(DESTDIR)$(INSTALL_PREFIX)/share/dds/java/build_scripts"
+" cp ../../build_scripts/java?_wrapper.pl $(DESTDIR)$(INSTALL_PREFIX)/share/dds/java/build_scripts"
+" cp *.h $(DESTDIR)$(INSTALL_PREFIX)/share/dds/java"
}
}
--- src/OpenDDS/java/tao/tao_java.mpc
+++ src/OpenDDS/java/tao/tao_java.mpc
@@ -34,6 +34,6 @@ project: taolib, idl2jni, install {
}
verbatim(gnuace, postinstall) {
-" cp $(DDS_ROOT)/lib/tao_java.jar $(INSTALL_PREFIX)/lib"
+" cp $(DDS_ROOT)/lib/tao_java.jar $(DESTDIR)$(INSTALL_PREFIX)/lib"
}
}
|