Merge remote-tracking branch 'origin/master' into translation

[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 6729307ecf8adc1ff1993e2c950f23c5a667e2ef..b0f26d398bab75c28225cb99e7a9199570655daf 100644 (file)
--- a/stepmake/stepmake/install-out-targets.make
+++ b/stepmake/stepmake/install-out-targets.make
@@ -17,9 +17,9 @@ 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)))