X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Fstepmake%2Finstall-targets.make;h=1344a2f52407801724be203f9195c7647be8a210;hb=149f0cddc0bad45dd8c1822195b0352fdc6912b5;hp=9e89eedbf6b65dd98ccfe8e8a15bae52646632a4;hpb=b3ab29ecec5ce9bbbcb334c86c36b9cfc06bba86;p=lilypond.git

diff --git a/stepmake/stepmake/install-targets.make b/stepmake/stepmake/install-targets.make
index 9e89eedbf6..1344a2f524 100644
--- a/stepmake/stepmake/install-targets.make
+++ b/stepmake/stepmake/install-targets.make
@@ -6,16 +6,14 @@ local-install-outfiles:
 # urg, parameterise
 local-install-files: $(INSTALLATION_FILES)
 	$(PRE_INSTALL)
-	-$(INSTALL) -d $(DESTDIR)$(INSTALLATION_DIR)
-	for i in $(foreach j,$(INSTALLATION_FILES),$(src-dir)/$(j)); do \
-		$(INSTALL) -m 644 $$i $(DESTDIR)$(INSTALLATION_DIR)/ ; done
+	-$(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) && \
-		for i in $(foreach j,INSTALLATION_FILES$(suff), $(src-dir)/$(j)); do \
-			$(INSTALL) -m 644 $$i $(DESTDIR)$(INSTALLATION_DIR$(suff))/; done )
+		($(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 
+local-uninstall: local-uninstall-outfiles local-uninstall-files
 
 local-uninstall-outfiles:
 
@@ -24,5 +22,5 @@ local-uninstall-files:
 	rm -f $(foreach suff, $(INSTALLATION_SUFFIXES),  \
 		$(foreach i, $(INSTALLATION_FILES$(suff)),\
 			$(DESTDIR)$(INSTALLATION_DIR$(suff)/$(i))))
-	-rmdir $(DESTDIR)$(INSTALLATION_DIR) $(foreach suff, $(INSTALLATION_SUFFIXES), $(DESTDIR)$(INSTALLATION_DIR$(suff))/)
+	-rmdir -p $(DESTDIR)$(INSTALLATION_DIR) $(foreach suff, $(INSTALLATION_SUFFIXES), $(DESTDIR)$(INSTALLATION_DIR$(suff))/)