Merge remote branch 'origin/master' into release/unstable

[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 eb445927a9023efe4f3c135f926fdd579d86e8d7..b0f26d398bab75c28225cb99e7a9199570655daf 100644 (file)
--- a/stepmake/stepmake/install-out-targets.make
+++ b/stepmake/stepmake/install-out-targets.make
@@ -1,41 +1,25 @@
-# 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) $(INSTALLATION_OUT_FILES1) $(INSTALLATION_OUT_FILES2)
-       -$(INSTALL) -d $(INSTALLATION_OUT_DIR)
-       $(foreach i, $(INSTALLATION_OUT_FILES), \
-               $(INSTALL) -m 644 $(i) $(INSTALLATION_OUT_DIR) && )true
-ifneq ($(strip $(INSTALLATION_OUT_FILES1)),)
-       -$(INSTALL) -d $(INSTALLATION_OUT_DIR1)
-       $(foreach i, $(INSTALLATION_OUT_FILES1), \
-               $(INSTALL) -m 644 $(i) $(INSTALLATION_OUT_DIR1) && )true
-endif
-ifneq ($(strip $(INSTALLATION_OUT_FILES2)),)
-       -$(INSTALL) -d $(INSTALLATION_OUT_DIR2)
-       $(foreach i, $(INSTALLATION_OUT_FILES2), \
-               $(INSTALL) -m 644 $(i) $(INSTALLATION_OUT_DIR2) && )true
-endif
+local-install-outfiles: $(INSTALLATION_OUT_FILES) $(foreach suff, $(INSTALLATION_OUT_SUFFIXES), $(INSTALLATION_OUT_FILES$(suff)))
+       $(if $(INSTALLATION_OUT_DIR),\
+               ($(INSTALLPY) -d $(DESTDIR)$(INSTALLATION_OUT_DIR) || true) \
+                && $(INSTALLPY) -c -m 644 $(INSTALLATION_OUT_FILES) $(DESTDIR)$(INSTALLATION_OUT_DIR)/, true)
+       $(foreach suff, $(INSTALLATION_OUT_SUFFIXES),  \
+               ($(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:
-       $(foreach  i, $(notdir $(INSTALLATION_OUT_FILES)), \
-               rm -f $(INSTALLATION_OUT_DIR)/$(i) && ) true
-       -rmdir $(INSTALLATION_OUT_DIR)
-ifneq ($(strip $(INSTALLATION_OUT_FILES1)),)
-       $(foreach  i, $(notdir $(INSTALLATION_OUT_FILES1)), \
-               rm -f $(INSTALLATION_OUT_DIR1)/$(i) && ) true
-       -rmdir $(INSTALLATION_OUT_DIR1)
-endif
-ifneq ($(strip $(INSTALLATION_OUT_FILES2)),)
-       $(foreach  i, $(notdir $(INSTALLATION_OUT_FILES2)), \
-               rm -f $(INSTALLATION_OUT_DIR2)/$(i) && ) true
-       -rmdir $(INSTALLATION_OUT_DIR2)
-endif
-#      -(cd $(INSTALLATION_OUT_DIR)/..; dir=`dirname \`pwd\`` cd ..; rmdir $$dir)
+local-uninstall-outfiles:
+       rm -f $(foreach  i, $(INSTALLATION_OUT_FILES:$(outdir)/%=%), \
+               $(DESTDIR)$(INSTALLATION_OUT_DIR)/$(i))
+       rm -f $(foreach suff, $(INSTALLATION_OUT_SUFFIXES),  \
+               $(foreach i, $(INSTALLATION_OUT_FILES$(suff):$(outdir)/%=%), \
+                       $(DESTDIR)$(INSTALLATION_OUT_DIR$(suff))/$(i)))
+       -rmdir -p $(DESTDIR)$(INSTALLATION_OUT_DIR) $(foreach suff, $(INSTALLATION_OUT_SUFFIXES), $(DESTDIR)$(INSTALLATION_OUT_DIR$(suff)))