(local-uninstall): idem.

diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make
index e3cbc6ec019f81c1d38f5b21cad6dc853e852d79..a196a357bc0e5d4ac6ac50a4f418da910e1ab154 100644 (file)
--- a/stepmake/stepmake/generic-targets.make
+++ b/stepmake/stepmake/generic-targets.make
@@ -112,7 +112,7 @@ local-distclean:
 local-maintainerclean:
 
 install-strip:
-       $(MAKE) INSTALL="$(INSTALL) -s" install
+       $(MAKE) INSTALLPY="$(INSTALLPY) -s" install
 
 ifeq ($(strip $(depth)),.)
 final-install:
@@ -132,9 +132,8 @@ uninstall: local-uninstall
 local-uninstall:
 
 installextradoc:
-       -$(INSTALL) -d $(DESTDIR)$(prefix)/doc/$(package)
-       $(foreach i, $(EXTRA_DOC_FILES),\
-               cp -r $(i) $(prefix)/doc/$(package) &&) true
+       -$(INSTALLPY) -d $(DESTDIR)$(prefix)/doc/$(package)
+       cp -r $(EXTRA_DOC_FILES) $(prefix)/doc/$(package) 
 
 include $(outdir)/dummy.dep $(wildcard $(outdir)/*.dep) # expect a warning here
 

diff --git a/stepmake/stepmake/install-library-targets.make b/stepmake/stepmake/install-library-targets.make
index fac40229f711df4b9f46c147274b28f8e107986b..2662fbe3b172e77871b48eced0e62d4ecebc07a1 100644 (file)
--- a/stepmake/stepmake/install-library-targets.make
+++ b/stepmake/stepmake/install-library-targets.make
@@ -1,17 +1,17 @@
 
 local-install: $(LIBRARY)
 ifneq ($(strip $(INSTALL_HEADERS)),)
-       $(INSTALL) -d $(DESTDIR)$(includedir)
-       $(INSTALL) $(INSTALL_HEADERS) $(DESTDIR)$(includedir)
+       $(INSTALLPY) -d $(DESTDIR)$(includedir)
+       $(INSTALLPY) $(INSTALL_HEADERS) $(DESTDIR)$(includedir)
 endif
 ifeq ($(LIB_SUFFIX),.so)
-       $(INSTALL) -d $(DESTDIR)$(libdir)
-       $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)/$(INSTALL_LIBRARY).$(VERSION)
+       $(INSTALLPY) -d $(DESTDIR)$(libdir)
+       $(INSTALLPY) $(LIBRARY) $(DESTDIR)$(libdir)/$(INSTALL_LIBRARY).$(VERSION)
        ln -s $(LIB_PREFIX)intl$(LIB_SUFFIX).$(VERSION) $(DESTDIR)$(libdir)/$(LIB_PREFIX)intl$(LIB_SUFFIX).$(MAJOR_VERSION)
        ln -s $(LIB_PREFIX)intl$(LIB_SUFFIX).$(VERSION) $(DESTDIR)$(libdir)/$(LIB_PREFIX)intl$(LIB_SUFFIX)
 else
-       $(INSTALL) -d $(DESTDIR)$(libdir)
-       $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)/$(INSTALL_LIBRARY)
+       $(INSTALLPY) -d $(DESTDIR)$(libdir)
+       $(INSTALLPY) $(LIBRARY) $(DESTDIR)$(libdir)/$(INSTALL_LIBRARY)
 endif
 
 local-uninstall:

diff --git a/stepmake/stepmake/install-targets.make b/stepmake/stepmake/install-targets.make
index 394270b3c956f5fa92fe49e9cf074f1e2ecd8565..efa1273aff478246c0567f7c9b4c3ad03d19d665 100644 (file)
--- a/stepmake/stepmake/install-targets.make
+++ b/stepmake/stepmake/install-targets.make
@@ -6,12 +6,12 @@ local-install-outfiles:
 # urg, parameterise
 local-install-files: $(INSTALLATION_FILES)
        $(PRE_INSTALL)
-       -$(INSTALL) -d $(DESTDIR)$(INSTALLATION_DIR)
+       -$(INSTALLPY) -d $(DESTDIR)$(INSTALLATION_DIR)
        $(INSTALLPY) -m 644 $(addprefix $(src-dir)/,$(INSTALLATION_FILES)) $(DESTDIR)$(INSTALLATION_DIR)/
 
        $(foreach suff, $(INSTALLATION_SUFFIXES),  \
-               ($(INSTALL) -d $(DESTDIR)$(INSTALLATION_DIR$(suff)) || true) && \
-               $(INSTALL) -m 644  $(addprefix $(src-dir)/, $(INSTALLATION_FILES$(suff))) $(DESTDIR)$(INSTALLATION_DIR$(suff))/ ) 
+               ($(INSTALLPY) -d $(DESTDIR)$(INSTALLATION_DIR$(suff)) || true) && \
+               $(INSTALLPY) -m 644  $(addprefix $(src-dir)/, $(INSTALLATION_FILES$(suff))) $(DESTDIR)$(INSTALLATION_DIR$(suff))/ ) 
        $(POST_INSTALL)
 
 local-uninstall: local-uninstall-outfiles local-uninstall-files 

diff --git a/stepmake/stepmake/omf-targets.make b/stepmake/stepmake/omf-targets.make
index eea2b7047b2da1b9d9a20dceed7999cef887ceaa..59bf6218fd1eaa9f468810fd1ea1ae16911e7a5a 100644 (file)
--- a/stepmake/stepmake/omf-targets.make
+++ b/stepmake/stepmake/omf-targets.make
@@ -4,8 +4,8 @@ omf: $(OMF_FILES)
 local-install: omf-local-install
 
 omf-local-install: $(OMF_FILES)
-       -$(INSTALL) -d $(DESTDIR)$(local_package_omfdir)
-       $(foreach a, $(OMF_FILES), $(INSTALL) -m 644 $(a) $(DESTDIR)$(local_package_omfdir)/$(notdir $(a)) && ) true
+       -$(INSTALLPY) -d $(DESTDIR)$(local_package_omfdir)
+       $(foreach a, $(OMF_FILES), $(INSTALLPY) -m 644 $(a) $(DESTDIR)$(local_package_omfdir)/$(notdir $(a)) && ) true
        @echo "Run scrollkeeper-update to register newly installed OMF files."
 
 local-uninstall: omf-local-uninstall

diff --git a/stepmake/stepmake/texinfo-vars.make b/stepmake/stepmake/texinfo-vars.make
index aa7e1a82397f7ca1ef206626fc2e9332b70f645e..30451cef6f9eb954f774c6865d43ebb36e35926d 100644 (file)
--- a/stepmake/stepmake/texinfo-vars.make
+++ b/stepmake/stepmake/texinfo-vars.make
@@ -17,7 +17,7 @@ MAKEINFO = LANG= $(MAKEINFO_PROGRAM)  --enable-encoding
 # info stuff
 INFO_INSTALL_FILES = $(wildcard $(addsuffix *, $(INFO_FILES)))
 INFO_INSTALL_COMMAND =$(if $(INFO_INSTALL_FILES),\
-       $(INSTALL) -d $(DESTDIR)$(package_infodir) ; \
+       $(INSTALLPY) -d $(DESTDIR)$(package_infodir) ; \
        $(MAKE) INSTALLATION_OUT_DIR=$(package_infodir) \
                depth=$(depth) INSTALLATION_OUT_FILES="$(INFO_INSTALL_FILES)" \
                -f $(stepdir)/install-out.sub.make,true)