Merge dictionary rename and uninstall fix.
authorOleksandr Gavenko <gavenkoa@gmail.com>
Fri, 03 Mar 2017 14:01:45 +0200
changeset 771 7c81eb58b618
parent 770 71b9d7ea4885 (diff)
parent 769 7877b9a74af7 (current diff)
child 772 ea173f7395a0
Merge dictionary rename and uninstall fix.
Makefile
gadict_en-ru+uk.gadict
gadict_en-ru+uk.xpm
--- 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 \