Fix "make uninstall"

diff --git a/stepmake/stepmake/help2man-targets.make b/stepmake/stepmake/help2man-targets.make
index 53782b63fc7d10eb36045db386ab93529a1a78b8..ae751892d7b322a968fd2eb845dba5b9562b8427 100644 (file)
--- a/stepmake/stepmake/help2man-targets.make
+++ b/stepmake/stepmake/help2man-targets.make
@@ -11,7 +11,7 @@ man: $(HELP2MAN_GROFFS)
 local-uninstall: uninstall-help2man
 
 uninstall-help2man:
-       $(foreach a, $(notdir $(MANGROFFS)), rm -f $(a) && ) true
+       $(foreach a, $(HELP2MAN_GROFFS), rm -f $(DESTDIR)$(mandir)/man1/$(notdir $(a)) && ) true
        -rmdir $(DESTDIR)$(mandir)/man1
 
 

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)))

diff --git a/stepmake/stepmake/install-targets.make b/stepmake/stepmake/install-targets.make
index f06ceadbe69f480a9c51dcba90bbecf279993793..89c4129f1d687a9696be973816471d6232adb0c5 100644 (file)
--- a/stepmake/stepmake/install-targets.make
+++ b/stepmake/stepmake/install-targets.make
@@ -22,5 +22,5 @@ local-uninstall-files:
        rm -f $(foreach suff, $(INSTALLATION_SUFFIXES),  \
                $(foreach i, $(INSTALLATION_FILES$(suff)),\
                        $(DESTDIR)$(INSTALLATION_DIR$(suff)/$(i))))
-       -rmdir $(DESTDIR)$(INSTALLATION_DIR) $(foreach suff, $(INSTALLATION_SUFFIXES), $(DESTDIR)$(INSTALLATION_DIR$(suff))/)
+       -rmdir -p $(DESTDIR)$(INSTALLATION_DIR) $(foreach suff, $(INSTALLATION_SUFFIXES), $(DESTDIR)$(INSTALLATION_DIR$(suff))/)
 

diff --git a/stepmake/stepmake/omf-targets.make b/stepmake/stepmake/omf-targets.make
index 59bf6218fd1eaa9f468810fd1ea1ae16911e7a5a..2a51b1bd58ec9fdc1e0075c68231cbd277ef5110 100644 (file)
--- a/stepmake/stepmake/omf-targets.make
+++ b/stepmake/stepmake/omf-targets.make
@@ -11,6 +11,6 @@ omf-local-install: $(OMF_FILES)
 local-uninstall: omf-local-uninstall
 
 omf-local-uninstall:
-       rm -f $(foreach i, $(OMF_FILES), $(DESTDIR)$(local_package_omfdir)/$(i))
+       rm -f $(foreach i, $(OMF_FILES), $(DESTDIR)$(local_package_omfdir)/$(notdir $(i)))
        -rmdir $(DESTDIR)$(local_package_omfdir)
 

diff --git a/stepmake/stepmake/texinfo-targets.make b/stepmake/stepmake/texinfo-targets.make
index aeda6e617159333834802997d9642e688b4239a8..245b2e6c629d8296776af10fde966aac84b4efcb 100644 (file)
--- a/stepmake/stepmake/texinfo-targets.make
+++ b/stepmake/stepmake/texinfo-targets.make
@@ -60,12 +60,12 @@ local-uninstall-WWW:
 
 else # out!=www
 
-local-install-info: info
-       -$(INSTALL) -d $(DESTDIR)$(package_infodir)
 ifneq ($(patsubst %/local,%,$(DESTDIR)$(prefix)),/usr)
 ## Can not have absolute symlinks because some binary packages build schemes
 ## install files in nonstandard root.  Best we can do is to notify the
 ## builder or packager.
+local-install-info: info
+       -$(INSTALL) -d $(DESTDIR)$(package_infodir)
        @echo
        @echo "***************************************************************"
        @echo "Please add or update the LilyPond direntries, do"
@@ -78,7 +78,13 @@ ifneq ($(patsubst %/local,%,$(DESTDIR)$(prefix)),/usr)
        @echo
        @echo "and read the extra instructions."
        @echo
+
+local-uninstall-info:
+       -rmdir $(DESTDIR)$(package_infodir)
+
 else # installing directly into standard /usr/...
+local-install-info: info
+       -$(INSTALL) -d $(DESTDIR)$(package_infodir)
        -$(INSTALL) -d $(DESTDIR)$(infodir)
        $(foreach f,$(INFO_FILES),install-info --remove --info-dir=$(infodir) $(f) ; )true
        install-info --info-dir=$(infodir) $(outdir)/$(MAIN_INFO_DOC).info
@@ -88,7 +94,13 @@ else # installing directly into standard /usr/...
        @echo
        @echo "    make out=www install-info "
        @echo
-endif # installing into standard /usr/* root# installing into /usr/...
+
+local-uninstall-info:
+       $(foreach f,$(INFO_FILES),install-info --remove --info-dir=$(infodir) $(f) ; )true
+       -rmdir $(DESTDIR)$(infodir)
+       -rmdir $(DESTDIR)$(package_infodir)
+
+endif # installing into standard /usr/* root
 
 endif # out!=www
 

diff --git a/vim/GNUmakefile b/vim/GNUmakefile
index b05ec0e3c7c42c52e3de3574d5ec6754badd4ed4..fd82e40164ae545679ce9529ece1f13285148b3c 100644 (file)
--- a/vim/GNUmakefile
+++ b/vim/GNUmakefile
@@ -27,8 +27,9 @@ local-install:
 local-uninstall:
        for a in compiler ftdetect ftplugin indent syntax; do \
                rm $(DESTDIR)$(vimdir)/$$a/lilypond.vim ; \
-               -rmdir -p $(DESTDIR)$(vimdir)/$$a ; \
+               rmdir $(DESTDIR)$(vimdir)/$$a; \
        done
+       -rmdir -p $(DESTDIR)$(vimdir)
 
 $(LILYPOND_WORDS):
        cd $(top-src-dir) && $(PYTHON) buildscripts/lilypond-words.py --words --vim --dir=$(top-build-dir)/vim/$(outconfbase)