diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-06-19 14:19:47 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-06-19 14:19:47 +0200 |
| commit | ee40915c35bb2b7ecd21e7e57493ed87c42a1cbd (patch) | |
| tree | 7a19967b34129b22d9fa97e975e6d87c3e6e7a5d | |
| parent | Fixed ICE-8101 - test failure causes tests running concurrently to be killed (diff) | |
| download | ice-ee40915c35bb2b7ecd21e7e57493ed87c42a1cbd.tar.bz2 ice-ee40915c35bb2b7ecd21e7e57493ed87c42a1cbd.tar.xz ice-ee40915c35bb2b7ecd21e7e57493ed87c42a1cbd.zip | |
Fix for ICE-8097 - no longer install IceDiscovery.ice and IceLocatorDiscovery.ice
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -28,15 +28,15 @@ $(eval $(call make-global-rule,distclean,$(languages))) $(eval $(call make-global-rule,install,$(languages))) # -# Install documentation and slice files +# Install documentation and slice files (don't install IceDiscovery and IceLocatorDiscovery slice files) # install:: install-doc install-slice -$(eval $(call install-data-files,$(wildcard $(slicedir)/*/*.ice),$(slicedir),$(install_slicedir),\ - install-slice,"Installing slice files")) +$(eval $(call install-data-files,$(filter-out %Discovery.ice,$(wildcard $(slicedir)/*/*.ice)),$(slicedir),\ + $(install_slicedir), install-slice,"Installing slice files")) $(eval $(call install-data-files,$(wildcard $(top_srcdir)/*LICENSE),$(top_srcdir),$(install_docdir),\ - install-doc,"Installing documentation files")) + install-doc,"Installing documentation files")) # # Create a symlink for the slice directory. We skip this step on macOS |