# HG changeset patch # User Oleksandr Gavenko # Date 1488542505 -7200 # Node ID 7c81eb58b618e905182001ce41353bdcd6fcb832 # Parent 71b9d7ea488564ead09ab2f2468b576ddb371f4d# Parent 7877b9a74af7543cc6924295191b7c0207c22baf Merge dictionary rename and uninstall fix. diff -r 7877b9a74af7 -r 7c81eb58b618 Makefile --- a/Makefile Fri Mar 03 13:49:17 2017 +0200 +++ b/Makefile Fri Mar 03 14:01:45 2017 +0200 @@ -186,7 +186,7 @@ $(INSTALL_DATA) contrib/gadict.el $(elispdir) emacs -batch -f batch-byte-compile $(elispdir)/gadict.el -OLD_DICT_FILES := gadict-abbr.dict-c5 gadict-adjective-en-ru.dict-c5 \ +OLD_DICT_FILES := gadict-abbr.dict-c5 gadict-adjective-en-ru.dict-c5 \ gadict-adverb-en-ru.dict-c5 gadict-conjunction-en-ru.dict-c5 \ gadict-en-ru.dict-c5 gadict-irregular-verbs-en-ru.dict-c5 \ gadict-numeral-en-ru.dict-c5 gadict-phrasal-verbs-en-ru.dict-c5 \ @@ -198,7 +198,7 @@ .PHONY: uninstall uninstall: - for f in $(DICTDZ_FILES) $(INDEX_FILES); do \ + for f in $(notdir $(DICTDZ_FILES) $(INDEX_FILES) $(PNG_FILES)); do \ rm -f $(datadir)/$$f; \ done for f in $(OLD_DICTDZ_FILES) $(OLD_INDEX_FILES); do \