diff options
| author | Adam Mitz <mitza@objectcomputing.com> | 2021-07-09 14:41:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-09 14:41:27 -0500 |
| commit | 27718b5ac6bd219a4cf0ebdc1182c396ee40eb17 (patch) | |
| tree | 430b07b3ced506e23939129853dbb6bc12ead543 | |
| parent | 8dafd144835b7a8bc17db5051690bf36229d1050 (diff) | |
| parent | b23362324e929b731f3908c2f1d458d16c524f49 (diff) | |
| download | ATCD-27718b5ac6bd219a4cf0ebdc1182c396ee40eb17.tar.gz | |
Merge pull request #1593 from mitza-oci/install-relative
[ACE 6] make install: use relative links in prefix/share
| -rw-r--r-- | ACE/apps/gperf/src/gperf.mpc | 2 | ||||
| -rw-r--r-- | TAO/TAO_IDL/tao_idl.mpc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ACE/apps/gperf/src/gperf.mpc b/ACE/apps/gperf/src/gperf.mpc index 1f29eff82a1..f65c6f27a60 100644 --- a/ACE/apps/gperf/src/gperf.mpc +++ b/ACE/apps/gperf/src/gperf.mpc @@ -17,6 +17,6 @@ project(gperf) : aceexe, install, crosscompile { verbatim(gnuace, postinstall) { " @$(MKDIR) $(DESTDIR)$(INSTALL_PREFIX)/share/ace/bin" -" ln -sf $(INSTALL_PREFIX)/bin/ace_gperf $(DESTDIR)$(INSTALL_PREFIX)/share/ace/bin" +" ln -sf ../../../bin/ace_gperf $(DESTDIR)$(INSTALL_PREFIX)/share/ace/bin" } } diff --git a/TAO/TAO_IDL/tao_idl.mpc b/TAO/TAO_IDL/tao_idl.mpc index 475529bdb6a..7d7c68f981b 100644 --- a/TAO/TAO_IDL/tao_idl.mpc +++ b/TAO/TAO_IDL/tao_idl.mpc @@ -39,11 +39,11 @@ project(TAO_IDL_EXE) : aceexe, install, tao_output, tao_idl_fe { verbatim(gnuace, postinstall) { " @$(MKDIR) $(DESTDIR)$(INSTALL_PREFIX)/share/ace/bin" -" ln -sf $(INSTALL_PREFIX)/bin/tao_idl $(DESTDIR)$(INSTALL_PREFIX)/share/ace/bin" +" ln -sf ../../../bin/tao_idl $(DESTDIR)$(INSTALL_PREFIX)/share/ace/bin" "ifeq ($(shared_libs),1)" " @$(MKDIR) $(DESTDIR)$(INSTALL_PREFIX)/share/ace/lib" -" ln -sf $(INSTALL_PREFIX)/$(INSTALL_LIB)/$(LIB_PREFIX)TAO_IDL_FE.$(SOEXT) $(DESTDIR)$(INSTALL_PREFIX)/share/ace/lib" -" ln -sf $(INSTALL_PREFIX)/$(INSTALL_LIB)/$(LIB_PREFIX)TAO_IDL_BE.$(SOEXT) $(DESTDIR)$(INSTALL_PREFIX)/share/ace/lib" +" ln -sf ../../../$(INSTALL_LIB)/$(LIB_PREFIX)TAO_IDL_FE.$(SOEXT) $(DESTDIR)$(INSTALL_PREFIX)/share/ace/lib" +" ln -sf ../../../$(INSTALL_LIB)/$(LIB_PREFIX)TAO_IDL_BE.$(SOEXT) $(DESTDIR)$(INSTALL_PREFIX)/share/ace/lib" "endif" } |