diff options
| author |   Alexey Neyman <stilor@att.net> | 2018-11-12 09:15:58 (GMT) |
|---|---|---|
| committer | Alexey Neyman <stilor@att.net> | 2018-11-12 09:19:04 (GMT) |
| commit | 35bec76b6371057746ac11ac25cffab75b8641db (patch) | |
| tree | efaf5f9dce421caff012ccf99af3978bacbb3c0d /scripts/scripts.mk | |
| parent | fad46ac9d1504a90590cf585a700656e1b58e513 (diff) | |
Fix installation of the license file
... for ct-ng configured without --enable-local. Also, install
licenses in subdirectories of the components.
Also, ct-ng configured with --enable-local removed the scripts directory
upon `ct-ng distclean`.
Also, misspelled CT_WGET/CT_CURL variables prevented use of
`ct-ng updatetools`.
Fixes #1091.
Signed-off-by: Alexey Neyman <stilor@att.net>
Diffstat (limited to 'scripts/scripts.mk')
| -rw-r--r-- | scripts/scripts.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/scripts.mk b/scripts/scripts.mk index d77f1a7..eeb8a50 100644 --- a/scripts/scripts.mk +++ b/scripts/scripts.mk @@ -31,11 +31,11 @@ ifneq ($(strip $(V)),2) curl_silent_opt = --silent endif -ifneq ($(CT_wget),) -download_cmd = $(CT_wget) --passive-ftp $(wget_silent_opt) -O $@ +ifneq ($(CT_WGET),) +download_cmd = $(CT_WGET) --passive-ftp $(wget_silent_opt) -O $@ else -ifneq ($(CT_curl),) -download_cmd = $(CT_curl) --ftp-pasv $(curl_silent_opt) -o $@ +ifneq ($(CT_CURL),) +download_cmd = $(CT_CURL) --ftp-pasv $(curl_silent_opt) -o $@ else download_cmd = $(error wget or curl needed for downloads) endif |