diff options
author | Adam Mitz <mitza@objectcomputing.com> | 2019-01-07 15:19:56 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-07 15:19:56 -0800 |
commit | d69030d2e0fe3d0f7c226ecd837b03cd514d796a (patch) | |
tree | 78218f8ba59a385120658af0d2ee0ea276b6008d | |
parent | 931bfaa02c85801ec9b3f08cc17a2756014c05ba (diff) | |
parent | a06c24a9f213f269a4ca41504bb115ce77b0dc92 (diff) | |
download | ATCD-d69030d2e0fe3d0f7c226ecd837b03cd514d796a.tar.gz |
Merge pull request #782 from mitza-oci/taoidl-install-static
make install for tao_idl: don't link to shared libraries if they're not built
-rw-r--r-- | TAO/TAO_IDL/tao_idl.mpc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/TAO/TAO_IDL/tao_idl.mpc b/TAO/TAO_IDL/tao_idl.mpc index 050b159e247..c2066e19b68 100644 --- a/TAO/TAO_IDL/tao_idl.mpc +++ b/TAO/TAO_IDL/tao_idl.mpc @@ -40,8 +40,10 @@ 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" +"ifeq ($(shared_libs),1)" " @$(MKDIR) $(DESTDIR)$(INSTALL_PREFIX)/share/ace/lib" " ln -sf $(INSTALL_PREFIX)/$(INSTALL_LIB)/$(LIB_PREFIX)TAO_IDL_[FB]E.$(SOEXT) $(DESTDIR)$(INSTALL_PREFIX)/share/ace/lib" +"endif" } Source_Files { |