Doc-es: various updates.

[lilypond.git] / stepmake / stepmake / install-out-targets.make

diff --git a/stepmake/stepmake/install-out-targets.make b/stepmake/stepmake/install-out-targets.make
index 3abb38417bb8007782e94bbd49741f3ed636c4f7..b0f26d398bab75c28225cb99e7a9199570655daf 100644 (file)
--- a/stepmake/stepmake/install-out-targets.make
+++ b/stepmake/stepmake/install-out-targets.make
@@ -5,23 +5,21 @@ local-install-files:
 
 # urg, parameterise
 local-install-outfiles: $(INSTALLATION_OUT_FILES) $(foreach suff, $(INSTALLATION_OUT_SUFFIXES), $(INSTALLATION_OUT_FILES$(suff)))
-       -$(INSTALL) -d $(INSTALLATION_OUT_DIR)
-       $(foreach i, $(INSTALLATION_OUT_FILES), \
-               $(INSTALL) -m 644 $(i) $(INSTALLATION_OUT_DIR)/ && ) true
+       $(if $(INSTALLATION_OUT_DIR),\
+               ($(INSTALLPY) -d $(DESTDIR)$(INSTALLATION_OUT_DIR) || true) \
+                && $(INSTALLPY) -c -m 644 $(INSTALLATION_OUT_FILES) $(DESTDIR)$(INSTALLATION_OUT_DIR)/, true)
        $(foreach suff, $(INSTALLATION_OUT_SUFFIXES),  \
-               ($(INSTALL) -d $(INSTALLATION_OUT_DIR$(suff))/ || true) && \
-               $(foreach i, $(INSTALLATION_OUT_FILES$(suff)), \
-                       $(INSTALL) -m 644 $(i) $(INSTALLATION_OUT_DIR$(suff))/ && ) true && ) true
+               ($(INSTALLPY) -d $(DESTDIR)$(INSTALLATION_OUT_DIR$(suff))/ || true) && \
+               $(INSTALLPY) -c -m 644 $(INSTALLATION_OUT_FILES$(suff)) $(DESTDIR)$(INSTALLATION_OUT_DIR$(suff))/ && ) true
 
-
-local-uninstall: local-uninstall-outfiles local-uninstall-files 
+local-uninstall: local-uninstall-outfiles local-uninstall-files
 
 local-uninstall-files:
 
 local-uninstall-outfiles:
-       rm -f $(foreach  i, $(notdir $(INSTALLATION_OUT_FILES)), \
-               $(INSTALLATION_OUT_DIR)/$(i))
+       rm -f $(foreach  i, $(INSTALLATION_OUT_FILES:$(outdir)/%=%), \
+               $(DESTDIR)$(INSTALLATION_OUT_DIR)/$(i))
        rm -f $(foreach suff, $(INSTALLATION_OUT_SUFFIXES),  \
-               $(foreach i, $(INSTALLATION_OUT_FILES$(suff)), \
-                       $(INSTALLATION_OUT_DIR$(suff))/$(i)))
-       -rmdir $(INSTALLATION_OUT_DIR) $(foreach suff, $(INSTALLATION_OUT_SUFFIXES), $(INSTALLATION_OUT_DIR$(suff)))
+               $(foreach i, $(INSTALLATION_OUT_FILES$(suff):$(outdir)/%=%), \
+                       $(DESTDIR)$(INSTALLATION_OUT_DIR$(suff))/$(i)))
+       -rmdir -p $(DESTDIR)$(INSTALLATION_OUT_DIR) $(foreach suff, $(INSTALLATION_OUT_SUFFIXES), $(DESTDIR)$(INSTALLATION_OUT_DIR$(suff)))