* stepmake/stepmake/install-targets.make (local-uninstall): idem.

[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 e461473f6bc293659e3d6a9802a81821693c2136..6b987d8463a19be35fe861cb8e0fdd56b2d46885 100644 (file)
--- a/stepmake/stepmake/install-out-targets.make
+++ b/stepmake/stepmake/install-out-targets.make
@@ -1,27 +1,24 @@
-# install-out-targets.make
 
-localinstall: localinstall-files localinstall-outfiles
+local-install: local-install-files local-install-outfiles
 
-localinstall-files:
+local-install-files:
 
 # urg, parameterise
-localinstall-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
+local-install-outfiles: $(INSTALLATION_OUT_FILES) $(foreach suff, $(INSTALLATION_OUT_SUFFIXES), $(INSTALLATION_OUT_FILES$(suff)))
+       -$(INSTALLPY) -d $(DESTDIR)$(INSTALLATION_OUT_DIR)
+       $(INSTALLPY) -c -m 644 $(INSTALLATION_OUT_FILES) $(DESTDIR)$(INSTALLATION_OUT_DIR)/
        $(foreach suff, $(INSTALLATION_OUT_SUFFIXES),  \
-               $(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
 
-localuninstall: localuninstall-outfiles localuninstall-files 
+local-uninstall: local-uninstall-outfiles local-uninstall-files 
 
-localuninstall-files:
+local-uninstall-files:
 
-localuninstall-outfiles:
+local-uninstall-outfiles:
        rm -f $(foreach  i, $(notdir $(INSTALLATION_OUT_FILES)), \
-               $(INSTALLATION_OUT_DIR)/$(i))
+               $(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)))
+                       $(DESTDIR)$(INSTALLATION_OUT_DIR$(suff))/$(i)))
+       -rmdir $(DESTDIR)$(INSTALLATION_OUT_DIR) $(foreach suff, $(INSTALLATION_OUT_SUFFIXES), $(DESTDIR)$(INSTALLATION_OUT_DIR$(suff)))