diff options
Diffstat (limited to 'devel/ice/files/patch-config-Make.common.rules')
| -rw-r--r-- | devel/ice/files/patch-config-Make.common.rules | 39 |
1 files changed, 33 insertions, 6 deletions
diff --git a/devel/ice/files/patch-config-Make.common.rules b/devel/ice/files/patch-config-Make.common.rules index 7ba9dd1fadd1..8dd6eb5c8451 100644 --- a/devel/ice/files/patch-config-Make.common.rules +++ b/devel/ice/files/patch-config-Make.common.rules @@ -1,18 +1,45 @@ --- config.orig/Make.common.rules 2013-05-20 22:21:58.666286011 +0000 +++ config/Make.common.rules 2013-05-20 22:20:50.897196090 +0000 -@@ -378,11 +378,15 @@ +@@ -19,7 +19,7 @@ + SHORT_VERSION = 3.4 + SOVERSION = 34 + +-INSTALL = cp -fp ++INSTALL = %%INSTALL_PROGRAM%% + INSTALL_PROGRAM = ${INSTALL} + INSTALL_LIBRARY = ${INSTALL} + INSTALL_DATA = ${INSTALL} +@@ -386,11 +386,15 @@ then \ - echo "Creating $(install_slicedir)..." ; \ - $(call mkdir, $(install_slicedir)) ; \ + echo "Creating $(DESTDIR)$(install_slicedir)..." ; \ + $(call mkdir, $(DESTDIR)$(install_slicedir), -p) ; \ + fi + -+ @if test -d $(install_slicedir) ; \ ++ @if test -d $(DESTDIR)$(install_slicedir) ; \ + then \ cd $(top_srcdir)/../slice ; \ for subdir in * ; \ do \ - echo "Copying slice/$$subdir to $(install_slicedir)..." ; \ - cp -fpr $$subdir $(install_slicedir) ; \ + echo "Copying slice/$$subdir to $(DESTDIR)$(install_slicedir)..." ; \ + cp -fpr $$subdir $(DESTDIR)$(install_slicedir) ; \ done ; \ - fi + fi + +@@ -410,12 +410,12 @@ + fi + + +- @if test ! -f $(DESTDIR)$(prefix)/CHANGES$(TEXT_EXTENSION) ; \ ++ @if test ! -f $(DESTDIR)$(install_slicedir)/CHANGES$(TEXT_EXTENSION) ; \ + then \ +- $(call installdata,$(top_srcdir)/../CHANGES$(TEXT_EXTENSION),$(DESTDIR)$(prefix)) ; \ ++ $(call installdata,$(top_srcdir)/../CHANGES$(TEXT_EXTENSION),$(DESTDIR)$(install_slicedir)) ; \ + fi + +- @if test ! -f $(DESTDIR)$(prefix)/RELEASE_NOTES$(TEXT_EXTENSION) ; \ ++ @if test ! -f $(DESTDIR)$(install_slicedir)/RELEASE_NOTES$(TEXT_EXTENSION) ; \ + then \ +- $(call installdata,$(top_srcdir)/../RELEASE_NOTES$(TEXT_EXTENSION),$(DESTDIR)$(prefix)) ; \ ++ $(call installdata,$(top_srcdir)/../RELEASE_NOTES$(TEXT_EXTENSION),$(DESTDIR)$(install_slicedir)) ; \ + fi |