diff options
| author |   Alexey Neyman <stilor@att.net> | 2017-07-17 05:56:30 (GMT) |
|---|---|---|
| committer | Alexey Neyman <stilor@att.net> | 2017-07-17 05:56:30 (GMT) |
| commit | 2472ebce2ea75ecc73c144316e3464a77750acbe (patch) | |
| tree | 1bd35e09b1a81e65a62305b1769ba4ea0be71ae2 | |
| parent | c609be171376b31ffe2648aef52c44a2e46f3c09 (diff) | |
Fix new framework for running from installed path
Fixes #777
Signed-off-by: Alexey Neyman <stilor@att.net>
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | scripts/functions | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 8f7821c..df09f80 100644 --- a/Makefile.in +++ b/Makefile.in @@ -272,7 +272,7 @@ install-lib: $(DESTDIR)$(libdir) \ install-lib-main \ install-lib-samples -LIB_SUB_DIR := config contrib patches scripts +LIB_SUB_DIR := config contrib packages scripts $(patsubst %,install-lib-%-copy,$(LIB_SUB_DIR)): install-lib-%-copy: $(DESTDIR)$(libdir) $(call __silent,INSTDIR,$*)tar cf - --exclude='*.sh.in' --exclude='*.in.in' --exclude=.gitignore $* \ |(cd "$(DESTDIR)$(libdir)"; tar xf -) diff --git a/scripts/functions b/scripts/functions index 79b7321..2b660ef 100644 --- a/scripts/functions +++ b/scripts/functions @@ -1910,7 +1910,7 @@ CT_DoExtractPatch() # Can't use CT_DoExecLog because of the '{} \;' to be passed un-mangled to find find . -type f -name "${cfg}" \ -exec chmod -v u+w {} \; \ - -exec cp -v "${CT_TOP_DIR}/scripts/${cfg}" {} \; |CT_DoLog ALL + -exec cp -v "${CT_LIB_DIR}/scripts/${cfg}" {} \; |CT_DoLog ALL done fi |