blob: 8dd6eb5c8451f2945977dff5eecd7be3516f9aa5 (
plain) (
tree)
|
|
--- 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
@@ -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 $(DESTDIR)$(install_slicedir)..." ; \
$(call mkdir, $(DESTDIR)$(install_slicedir), -p) ; \
+ fi
+
+ @if test -d $(DESTDIR)$(install_slicedir) ; \
+ then \
cd $(top_srcdir)/../slice ; \
for subdir in * ; \
do \
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
|