Skip to content

Commit 1a0ae16

Browse files
committed
Simplify this base project, scripts are all in the bin director for several years now
* config/ndds_ts_defaults.mpb:
1 parent 3a4dc5d commit 1a0ae16

File tree

1 file changed

+2
-13
lines changed

1 file changed

+2
-13
lines changed

config/ndds_ts_defaults.mpb

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// -*- MPC -*-
22
project {
33
Define_Custom(NDDSTypeSupport) {
4-
command = <%quote%>$(NDDSSCRIPTDIR)/rtiddsgen<%quote%>
4+
command = <%quote%>$(NDDSHOME)/bin/rtiddsgen<%quote%>
55
commandflags = $(PLATFORM_NDDS_FLAGS)
66

7-
dependent = $(NDDSSCRIPTDIR)/rtiddsgen<%bat%>
7+
dependent = $(NDDSHOME)/bin/rtiddsgen<%bat%>
88

99
source_pre_extension = , Support, Plugin
1010
source_outputext = .cxx
@@ -18,16 +18,5 @@ project {
1818
verbatim(gnuace, macros, 1) {
1919
override no_hidden_visibility = 1
2020
override no_strict_aliasing = 1
21-
ifdef NDDSHOME
22-
ifndef NDDSSCRIPTDIR
23-
# At the moment NDDSHOME has been set but not NDDSSCRIPTDIR we see if
24-
# the scripts directory exists, if so we use that, if not we use bin
25-
ifneq ($(wildcard $(NDDSHOME)/scripts),)
26-
NDDSSCRIPTDIR = $(NDDSHOME)/scripts
27-
else
28-
NDDSSCRIPTDIR = $(NDDSHOME)/bin
29-
endif
30-
endif
31-
endif
3221
}
3322
}

0 commit comments

Comments
 (0)