aboutsummaryrefslogtreecommitdiffstats
path: root/makefile
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.11->trunkKim Alvefur2021-08-301-9/+9
|\
| * makefile: fix prosody.version targetLucas2021-08-151-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | POSIX is quite explicit regarding the precedence of AND-OR lists [0]: > The operators "&&" and "||" shall have equal precedence and shall be > evaluated with left associativity. For example, both of the following > commands write solely `bar` to standard output: > false && echo foo || echo bar > true || echo foo && echo bar Given that, `prosody.version` target behaves as ((((((test -f prosody.release && cp ...) || test -f ...) && sed ...) || test -f ...) && hexdump ...) || echo unknown > $@) In the case of release tarballs, `prosody.release` does exist, so the first AND pair is executed. Given that it's successful, then the first `test -f` in the OR pair is ignored, and instead the `sed` in the AND pair is executed. `sed` success, as `.hg_archival.txt` exists, making the second `test -f` in the OR pair ignored, and `hexdump` in the AND pair is executed. Now, given that `.hg` doesn't exist, it fails, so the last `echo` is run, overwriting `prosody.version` with `unknown`. This can be worked around placing `()` around the AND pairs. Decided to use conditionals instead, as I think they better communicate the intention of the block. [0]: https://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_09_03
* | GNUmakefile: Install the new util/prosodyctl/* too (thanks pascal.pascher)Kim Alvefur2020-06-031-0/+2
| |
* | GNUmakefile: Install util.human.*Kim Alvefur2020-06-031-0/+2
| |
* | makefile: Remove installation of mod_s2s dirKim Alvefur2020-06-031-2/+1
| | | | | | | | Already removed from the GNUmakeflie.
* | makefile: Allow configuring path to busted (to match GNUMakefile)Matthew Wild2018-12-041-1/+2
| |
* | makefile: Add lint target (to match GNUMakefile)Matthew Wild2018-12-041-0/+7
|/
* Add makefiles compatible with BSD makeKim Alvefur2018-03-111-0/+101