diff options
| -rw-r--r-- | config/Make.common.rules | 42 |
1 files changed, 25 insertions, 17 deletions
diff --git a/config/Make.common.rules b/config/Make.common.rules index 05adf63ae48..252c11343ff 100644 --- a/config/Make.common.rules +++ b/config/Make.common.rules @@ -474,32 +474,40 @@ endif install-common:: @if test ! -d $(DESTDIR)$(prefix) ; \ then \ - echo "Creating $(prefix)..." ; \ - $(call mkdir,$(DESTDIR)$(prefix), -p) ; \ + echo "Creating $(prefix)..." ; \ + $(call mkdir,$(DESTDIR)$(prefix), -p) ; \ fi @if test ! -d $(DESTDIR)$(install_slicedir) ; \ then \ - echo "Creating $(DESTDIR)$(install_slicedir)..." ; \ - $(call mkdir, $(DESTDIR)$(install_slicedir), -p) ; \ - if test ! -z "$(usr_dir_install)" ; \ - then \ - ln -s Ice-$(VERSION)/slice $(DESTDIR)/$(prefix)/share/slice ; \ - fi ; \ - cd $(top_srcdir)/../slice ; \ - for subdir in * ; \ - do \ - echo "Copying slice/$$subdir to $(DESTDIR)$(install_slicedir)..." ; \ - cp -fpr $$subdir $(DESTDIR)$(install_slicedir) ; \ - done ; \ - fi + echo "Creating $(DESTDIR)$(install_slicedir)..." ; \ + $(call mkdir, $(DESTDIR)$(install_slicedir), -p) ; \ + if test ! -z "$(usr_dir_install)" ; \ + then \ + $(call mkdir,$(DESTDIR)/$(prefix)/share/slice) ; \ + fi ; \ + cd $(top_srcdir)/../slice ; \ + for subdir in * ; \ + do \ + echo "Copying slice/$$subdir to $(DESTDIR)$(install_slicedir)..." ; \ + cp -fpr $$subdir $(DESTDIR)$(install_slicedir) ; \ + done ; \ + if test ! -z "$(usr_dir_install)" ; \ + then \ + cd $(top_srcdir)/../slice ; \ + for subdir in * ; \ + do \ + cd $(DESTDIR)/$(prefix)/share/slice && ln -s ../Ice-$(VERSION)/slice/$$subdir . ; \ + done ; \ + fi ; \ + fi @if test ! -f $(DESTDIR)$(install_docdir)/ICE_LICENSE$(TEXT_EXTENSION) ; \ then \ - $(call installdata,$(top_srcdir)/../ICE_LICENSE$(TEXT_EXTENSION),$(DESTDIR)$(install_docdir)) ; \ + $(call installdata,$(top_srcdir)/../ICE_LICENSE$(TEXT_EXTENSION),$(DESTDIR)$(install_docdir)) ; \ fi @if test ! -f $(DESTDIR)$(install_docdir)/LICENSE$(TEXT_EXTENSION) ; \ then \ - $(call installdata,$(top_srcdir)/../LICENSE$(TEXT_EXTENSION),$(DESTDIR)$(install_docdir)) ; \ + $(call installdata,$(top_srcdir)/../LICENSE$(TEXT_EXTENSION),$(DESTDIR)$(install_docdir)) ; \ fi |