Merge branch 'master' into lilypond/translation

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

diff --git a/stepmake/stepmake/install-targets.make b/stepmake/stepmake/install-targets.make
index 394270b3c956f5fa92fe49e9cf074f1e2ecd8565..1344a2f52407801724be203f9195c7647be8a210 100644 (file)
--- a/stepmake/stepmake/install-targets.make
+++ b/stepmake/stepmake/install-targets.make
@@ -6,15 +6,14 @@ 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 
+local-uninstall: local-uninstall-outfiles local-uninstall-files
 
 local-uninstall-outfiles:
 
@@ -23,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))/)