61336f80dc
* mk/targets.mk (ORGVERSION, GITVERSION): Get version from lisp/org.el header if it can't be retrieved from git-describe. As of elpa.git's ee03829f90 (Finalize the new master branch, 2020-12-14), org-release and org-git-version are empty strings in https://elpa.gnu.org/packages/org-*.tar files. This is because the new setup executes `make autoloads info' in an elpa.git worktree with an Org branch checked out, but elpa.git of course doesn't have Org's release tags. Maintaining the org.el version header has been a point of contention in the past [1], but the header has been there for a while now. Use it to avoid the above elpa.git issue. In the case of the master branch, the org-release value generated in a tag-less repo will have a different version than the one from a regular repo because org.el's version header has a "-dev" suffix, but that's still better than an empty version. [1] For example: https://orgmode.org/list/87zj1uhix6.fsf@gmx.us/ Reported-by: Pierre Langlois <pierre.langlois@gmx.com> Ref: https://orgmode.org/list/87y2hi9qev.fsf@gmx.com |
||
|---|---|---|
| .. | ||
| default.mk | ||
| guidesplit.pl | ||
| manfull.pl | ||
| mansplit.pl | ||
| org-fixup.el | ||
| orgcard2txt.pl | ||
| server.mk | ||
| targets.mk | ||