[geany/geany] c38f59: autotools: Only uninstall what we actually installed

Colomban Wendling git-noreply at xxxxx
Mon Oct 13 21:59:40 UTC 2014


Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Mon, 13 Oct 2014 21:59:40 UTC
Commit:      c38f59bbc422e2e39eeb1e5bdae2258214a0e86a
             https://github.com/geany/geany/commit/c38f59bbc422e2e39eeb1e5bdae2258214a0e86a

Log Message:
-----------
autotools: Only uninstall what we actually installed

Only manually uninstall the files we manually installed, as
uninstall-local might be run in parallel to Automake's own uninstall
targets.

We don't uninstall the directories as some docs seems to suggest
`rmdir` isn't really portable.  Anyway, Automake don't uninstall
directories either so it's not a real problem.

An alternative solution would be to keep the recursive removal of
`$(DOCDIR)` but move it to `uninstall-hook`, which is guaranteed to be
run after other uninstall rules.  However, recursive deletion is not
always sensible as it might remove files we didn't install, e.g. if the
user added them manually.


Modified Paths:
--------------
    doc/Makefile.am

Modified: doc/Makefile.am
4 lines changed, 3 insertions(+), 1 deletions(-)
===================================================================
@@ -113,7 +113,9 @@ clean-api-docs-local:
 endif
 
 uninstall-local:
-	rm -rf $(DOCDIR);
+	rm -f $(DOCDIR)/html/index.html
+	rm -f $(DOCDIR)/manual.txt
+	rm -f $(DOCDIR)/ScintillaLicense.txt
 
 # manually install some files under another name
 install-data-local:



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).


More information about the Commits mailing list