Changeset View
Changeset View
Standalone View
Standalone View
devel/ice/files/patch-config-Make.common.rules
| --- config.orig/Make.common.rules 2013-05-20 22:21:58.666286011 +0000 | --- config/Make.common.rules.orig 2015-06-23 15:30:20.000000000 +0000 | ||||
| +++ config/Make.common.rules 2013-05-20 22:20:50.897196090 +0000 | +++ config/Make.common.rules 2015-06-27 23:55:59.468049240 +0000 | ||||
| @@ -19,7 +19,7 @@ | @@ -19,7 +19,8 @@ | ||||
| SHORT_VERSION = 3.4 | SHORT_VERSION = 3.6 | ||||
| SOVERSION = 34 | SOVERSION = 36 | ||||
| -INSTALL = cp -fp | -INSTALL = cp -fp | ||||
| +override DESTDIR = | |||||
| +INSTALL = %%INSTALL_PROGRAM%% | +INSTALL = %%INSTALL_PROGRAM%% | ||||
| INSTALL_PROGRAM = ${INSTALL} | INSTALL_PROGRAM = ${INSTALL} | ||||
| INSTALL_LIBRARY = ${INSTALL} | INSTALL_LIBRARY = ${INSTALL} | ||||
| INSTALL_DATA = ${INSTALL} | INSTALL_DATA = ${INSTALL} | ||||
| @@ -386,11 +386,15 @@ | @@ -49,13 +50,13 @@ | ||||
| # | |||||
| # usr_dir_install means we want to install with a /usr style layout. | |||||
| # | |||||
| -ifeq ($(prefix), /usr) | |||||
| - usr_dir_install = 1 | |||||
| -endif | |||||
| - | |||||
| -ifeq ($(prefix), /usr/local) | |||||
| - usr_dir_install = 1 | |||||
| -endif | |||||
| +#ifeq ($(prefix), /usr) | |||||
| +# usr_dir_install = 1 | |||||
| +#endif | |||||
| +# | |||||
| +#ifeq ($(prefix), /usr/local) | |||||
| +# usr_dir_install = 1 | |||||
| +#endif | |||||
| # | |||||
| # A /usr style layout can be forced by setting USR_DIR_INSTALL=yes. | |||||
| @@ -461,20 +463,24 @@ | |||||
| then \ | then \ | ||||
| echo "Creating $(DESTDIR)$(install_slicedir)..." ; \ | ln -s Ice-$(VERSION)/slice $(DESTDIR)/$(prefix)/share/slice ; \ | ||||
| $(call mkdir, $(DESTDIR)$(install_slicedir), -p) ; \ | fi ; \ | ||||
| + fi | + fi | ||||
| + | + | ||||
| + @if test -d $(DESTDIR)$(install_slicedir) ; \ | + @if test -d $(DESTDIR)$(install_slicedir) ; \ | ||||
| + then \ | + then \ | ||||
| cd $(top_srcdir)/../slice ; \ | cd $(top_srcdir)/../slice ; \ | ||||
| for subdir in * ; \ | for subdir in * ; \ | ||||
| do \ | do \ | ||||
| echo "Copying slice/$$subdir to $(DESTDIR)$(install_slicedir)..." ; \ | echo "Copying slice/$$subdir to $(DESTDIR)$(install_slicedir)..." ; \ | ||||
| cp -fpr $$subdir $(DESTDIR)$(install_slicedir) ; \ | cp -fpr $$subdir $(DESTDIR)$(install_slicedir) ; \ | ||||
| done ; \ | done ; \ | ||||
| - fi | - fi | ||||
| + fi | + fi | ||||
| @@ -410,12 +410,12 @@ | - @if test ! -f $(DESTDIR)$(install_docdir)/ICE_LICENSE$(TEXT_EXTENSION) ; \ | ||||
| fi | + @if test ! -f $(DESTDIR)$(install_slicedir)/ICE_LICENSE$(TEXT_EXTENSION) ; \ | ||||
| - @if test ! -f $(DESTDIR)$(prefix)/CHANGES$(TEXT_EXTENSION) ; \ | |||||
| + @if test ! -f $(DESTDIR)$(install_slicedir)/CHANGES$(TEXT_EXTENSION) ; \ | |||||
| then \ | then \ | ||||
| - $(call installdata,$(top_srcdir)/../CHANGES$(TEXT_EXTENSION),$(DESTDIR)$(prefix)) ; \ | - $(call installdata,$(top_srcdir)/../ICE_LICENSE$(TEXT_EXTENSION),$(DESTDIR)$(install_docdir)) ; \ | ||||
| + $(call installdata,$(top_srcdir)/../CHANGES$(TEXT_EXTENSION),$(DESTDIR)$(install_slicedir)) ; \ | + $(call installdata,$(top_srcdir)/../ICE_LICENSE$(TEXT_EXTENSION),$(DESTDIR)$(install_slicedir)) ; \ | ||||
| fi | fi | ||||
| - @if test ! -f $(DESTDIR)$(prefix)/RELEASE_NOTES$(TEXT_EXTENSION) ; \ | - @if test ! -f $(DESTDIR)$(install_docdir)/LICENSE$(TEXT_EXTENSION) ; \ | ||||
| + @if test ! -f $(DESTDIR)$(install_slicedir)/RELEASE_NOTES$(TEXT_EXTENSION) ; \ | + @if test ! -f $(DESTDIR)$(install_slicedir)/LICENSE$(TEXT_EXTENSION) ; \ | ||||
| then \ | then \ | ||||
| - $(call installdata,$(top_srcdir)/../RELEASE_NOTES$(TEXT_EXTENSION),$(DESTDIR)$(prefix)) ; \ | - $(call installdata,$(top_srcdir)/../LICENSE$(TEXT_EXTENSION),$(DESTDIR)$(install_docdir)) ; \ | ||||
| + $(call installdata,$(top_srcdir)/../RELEASE_NOTES$(TEXT_EXTENSION),$(DESTDIR)$(install_slicedir)) ; \ | + $(call installdata,$(top_srcdir)/../LICENSE$(TEXT_EXTENSION),$(DESTDIR)$(install_slicedir)) ; \ | ||||
| fi | fi | ||||