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 762a509b4e837977208df4a58f421c78e6aaa2b3..1344a2f52407801724be203f9195c7647be8a210 100644 (file)
--- a/stepmake/stepmake/install-targets.make
+++ b/stepmake/stepmake/install-targets.make
@@ -6,23 +6,21 @@ local-install-outfiles:
 # urg, parameterise
 local-install-files: $(INSTALLATION_FILES)
        $(PRE_INSTALL)
-       -$(INSTALL) -d $(INSTALLATION_DIR)
-       for i in $(INSTALLATION_FILES); do \
-               $(INSTALL) -m 644 $$i $(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 $(INSTALLATION_DIR$(suff)) || true) && \
-               for i in $(INSTALLATION_FILES$(suff)); do \
-                       $(INSTALL) -m 644 $$i $(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:
 
 local-uninstall-files:
-       rm -f $(foreach i,  $(INSTALLATION_FILES), $(INSTALLATION_DIR)/$(i))
+       rm -f $(foreach i,  $(INSTALLATION_FILES), $(DESTDIR)$(INSTALLATION_DIR)/$(i))
        rm -f $(foreach suff, $(INSTALLATION_SUFFIXES),  \
                $(foreach i, $(INSTALLATION_FILES$(suff)),\
-                       $(INSTALLATION_DIR$(suff)/$(i))))
-       -rmdir $(INSTALLATION_DIR) $(foreach suff, $(INSTALLATION_SUFFIXES), $(INSTALLATION_DIR$(suff))/)
+                       $(DESTDIR)$(INSTALLATION_DIR$(suff)/$(i))))
+       -rmdir -p $(DESTDIR)$(INSTALLATION_DIR) $(foreach suff, $(INSTALLATION_SUFFIXES), $(DESTDIR)$(INSTALLATION_DIR$(suff))/)