From 2472ebce2ea75ecc73c144316e3464a77750acbe Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Sun, 16 Jul 2017 22:56:30 -0700 Subject: Fix new framework for running from installed path Fixes #777 Signed-off-by: Alexey Neyman 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 -- cgit v0.10.2-6-g49f6