diff -r 21c366ba2c6d -r f622dfd21f2c Makefile --- a/Makefile Tue Nov 08 00:28:05 2016 +0200 +++ b/Makefile Tue Nov 08 00:31:36 2016 +0200 @@ -168,6 +168,38 @@ DISTSRC_TARBALLS = dist/$(fullpkgname)_src.tar.gz # dist/$(fullpkgname)_src.zip ################################################################ +# Install/uninstall targets. + +.PHONY: install +install: $(DICTDZ_FILES) $(INDEX_FILES) $(PNG_FILES) + mkdir -p $(datadir) $(elispdir) + for f in $(DICTDZ_FILES) $(INDEX_FILES) $(PNG_FILES); do \ + $(INSTALL_DATA) $$f $(datadir); \ + done + $(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 \ +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 \ +gadict-preposition-en-ru.dict-c5 gadict-pronoun-en-ru.dict-c5 \ +gadict-regular-verbs-en-ru.dict-c5 + +OLD_DICTDZ_FILES := $(OLD_DICT_FILES:.dict-c5=.dict.dz) +OLD_INDEX_FILES := $(OLD_DICT_FILES:.dict-c5=.index) + +.PHONY: uninstall +uninstall: + for f in $(DICTDZ_FILES) $(INDEX_FILES); do \ + rm -f $(datadir)/$$f; \ + done + for f in $(OLD_DICTDZ_FILES) $(OLD_INDEX_FILES); do \ + rm -f $(datadir)/$$f; \ + done + rm -f $(elispdir)/gadict.el $(elispdir)/gadict.elc + +################################################################ # Deploy/release targets. .PHONY: deploy @@ -431,38 +463,6 @@ mkdir -p $@ ################################################################ -# Install/uninstall targets. - -.PHONY: install -install: $(DICTDZ_FILES) $(INDEX_FILES) $(PNG_FILES) - mkdir -p $(datadir) $(elispdir) - for f in $(DICTDZ_FILES) $(INDEX_FILES) $(PNG_FILES); do \ - $(INSTALL_DATA) $$f $(datadir); \ - done - $(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 \ -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 \ -gadict-preposition-en-ru.dict-c5 gadict-pronoun-en-ru.dict-c5 \ -gadict-regular-verbs-en-ru.dict-c5 - -OLD_DICTDZ_FILES := $(OLD_DICT_FILES:.dict-c5=.dict.dz) -OLD_INDEX_FILES := $(OLD_DICT_FILES:.dict-c5=.index) - -.PHONY: uninstall -uninstall: - for f in $(DICTDZ_FILES) $(INDEX_FILES); do \ - rm -f $(datadir)/$$f; \ - done - for f in $(OLD_DICTDZ_FILES) $(OLD_INDEX_FILES); do \ - rm -f $(datadir)/$$f; \ - done - rm -f $(elispdir)/gadict.el $(elispdir)/gadict.elc - -################################################################ # Documentation targets. .PHONY: docs