Build: end directories in their bare names and avoid some double slashes in logs.

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

diff --git a/stepmake/stepmake/install-targets.make b/stepmake/stepmake/install-targets.make
index c50452fbee9162eeed39cb2483992e652c8929da..1344a2f52407801724be203f9195c7647be8a210 100644 (file)
--- a/stepmake/stepmake/install-targets.make
+++ b/stepmake/stepmake/install-targets.make
@@ -1,29 +1,26 @@
-# install-targets.make
 
-localinstall: localinstall-files localinstall-outfiles
+local-install: local-install-files local-install-outfiles
 
-localinstall-outfiles:
+local-install-outfiles:
 
 # urg, parameterise
-localinstall-files:
+local-install-files: $(INSTALLATION_FILES)
        $(PRE_INSTALL)
-       -$(INSTALL) -d $(INSTALLATION_DIR)
-       $(foreach i,  $(INSTALLATION_FILES),\
-               $(INSTALL) -m 644 $(i) $(INSTALLATION_DIR)/ &&)true
+       -$(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) && \
-               $(foreach i, $(INSTALLATION_FILES$(suff)), \
-                       $(INSTALL) -m 644 $(i) $(INSTALLATION_DIR$(suff))/  && )  && ) true
+               ($(INSTALLPY) -d $(DESTDIR)$(INSTALLATION_DIR$(suff)) || true) && \
+               $(INSTALLPY) -m 644  $(addprefix $(src-dir), $(INSTALLATION_FILES$(suff))) $(DESTDIR)$(INSTALLATION_DIR$(suff))/ )
        $(POST_INSTALL)
 
-localuninstall: localuninstall-outfiles localuninstall-files 
+local-uninstall: local-uninstall-outfiles local-uninstall-files
 
-localuninstall-outfiles:
+local-uninstall-outfiles:
 
-localuninstall-files:
-       rm -f $(foreach i,  $(INSTALLATION_FILES), $(INSTALLATION_DIR)/$(i))
+local-uninstall-files:
+       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))/)