]> git.donarmstrong.com Git - lilypond.git/blobdiff - stepmake/stepmake/install-out-targets.make
Doc-fr: NR-1.5.2 merging rests
[lilypond.git] / stepmake / stepmake / install-out-targets.make
index 6b987d8463a19be35fe861cb8e0fdd56b2d46885..b0f26d398bab75c28225cb99e7a9199570655daf 100644 (file)
@@ -5,20 +5,21 @@ local-install-files:
 
 # urg, parameterise
 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)/
+       $(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
 
-local-uninstall: local-uninstall-outfiles local-uninstall-files 
+local-uninstall: local-uninstall-outfiles local-uninstall-files
 
 local-uninstall-files:
 
 local-uninstall-outfiles:
-       rm -f $(foreach  i, $(notdir $(INSTALLATION_OUT_FILES)), \
+       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)), \
+               $(foreach i, $(INSTALLATION_OUT_FILES$(suff):$(outdir)/%=%), \
                        $(DESTDIR)$(INSTALLATION_OUT_DIR$(suff))/$(i)))
-       -rmdir $(DESTDIR)$(INSTALLATION_OUT_DIR) $(foreach suff, $(INSTALLATION_OUT_SUFFIXES), $(DESTDIR)$(INSTALLATION_OUT_DIR$(suff)))
+       -rmdir -p $(DESTDIR)$(INSTALLATION_OUT_DIR) $(foreach suff, $(INSTALLATION_OUT_SUFFIXES), $(DESTDIR)$(INSTALLATION_OUT_DIR$(suff)))