Skip to content

Commit

Permalink
make: fix condition for the INSDIR_LICENSE rule (fixup 40fe9c9)
Browse files Browse the repository at this point in the history
  • Loading branch information
akinomyoga committed Aug 23, 2024
1 parent 40fe9c9 commit 5a8dcb4
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 5 deletions.
2 changes: 1 addition & 1 deletion GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ ifneq ($(INSDIR_DOC),$(INSDIR))
$(INSDIR_DOC)/%: $(OUTDIR)/doc/%
bash make_command.sh install "$<" "$@"
endif
ifneq ($(findstring $(INSDIR_LICENSE),$(INDDIR) $(INSDIR_DOC)),)
ifeq ($(findstring $(INSDIR_LICENSE),$(INSDIR) $(INSDIR_DOC)),)
$(INSDIR_LICENSE)/%: $(OUTDIR)/doc/%
bash make_command.sh install "$<" "$@"
endif
Expand Down
9 changes: 5 additions & 4 deletions docs/ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,11 @@
- syntax: support arbitrary suffixes in `bleopt filename_ls_colors` `#D2213` e169e31d
- util(vbell): support `bleopt vbell_align=panel` (requested by bb010g) `#D2228` fe85e0dd
- highlight: reflect the top-level positional parameters `#D2246` f08e8f08
- color: adjust default fg values in faces and add `bleopt color_scheme` (requested by mattmc3) `#D2248` e4cce0ea 5f5554a8 `#D2258` xxxxxxxx
- color: adjust default fg values in faces and add `bleopt color_scheme` (requested by mattmc3) `#D2248` e4cce0ea 5f5554a8 `#D2258` d6a38c43
- highlight: add `bleopt highlight_eval_word_limit` (motivated by orionalves) `#D2256` 6833bdf8
- progcomp: support `complete -E` `#D2257` xxxxxxxx
- make: support make variable `USE_DOC=no` `#D2259` xxxxxxxx
- progcomp: support `complete -E` `#D2257` ffac4205
- make: support make variable `USE_DOC=no` (requested by blackteahamburger) `#D2260` 40fe9c95
- make: fix condition for the INSDIR_LICENSE rule (reported by Jai-JAP) `#D2260` xxxxxxxx

## Changes

Expand Down Expand Up @@ -198,7 +199,7 @@
- contrib/bash-preexec: support `__bp_set_ret_value` (requested by Comnenus) `#D2238` b154058a
- contrib/colorglass: fix fixed-point round `#D2239` b154058a
- contrib: add `config/github48{1,3}` for elapsed-mark examples `#D2249` 67548656
- contrib: add `integration/fzf-menu` (motivated by pallaswept) `#D2251` ad6f58b7 xxxxxxxx
- contrib: add `integration/fzf-menu` (motivated by pallaswept) `#D2251` ad6f58b7 `#D2259` 5b9d9ab3
- contrib/integration/fzf-completion: add `ble/widget/fzf-complete` (motivated by 3ximus) `#D2252` ad6f58b7

## Documentation
Expand Down
5 changes: 5 additions & 0 deletions note.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7388,6 +7388,11 @@ bash_tips
* fixed: INSDIR_LICENSE と INSDIR_DOC が同じ場合の対策はしているが、それら
が INSDIR と一致する場合の対策がされていない気がする。修正する。

2024-08-24 make install が動かない (reported by Jai-JAP)
https://aur.archlinux.org/packages/blesh-git
$(INSDIR_LICENSE)/% に対するルールを独立に定義するかどうかの条件が反転して
いた。修正する。

* contrib: fzf-menu 修正 (reported by pallaswept) [#D2259]
https://github.com/akinomyoga/ble.sh/issues/479#issuecomment-2305871596
Ref: #D2251
Expand Down

0 comments on commit 5a8dcb4

Please sign in to comment.