summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2020-09-15 21:40:47 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2020-09-15 21:40:47 +0900
commitb4491fdf86140b82bb44a3748fe740584931ca18 (patch)
tree9b2e4d4dd9e5053025dcd72fbbadb0a968554074
parentfc2fae6cf24f7cea2374dcba2e73680305c32e53 (diff)
downloadtde-packaging-b4491fdf86140b82bb44a3748fe740584931ca18.tar.gz
tde-packaging-b4491fdf86140b82bb44a3748fe740584931ca18.zip
DEB build scripts: make sure to use extra dependency folder configured in the configuration file.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rwxr-xr-xdebian/_buildscripts/local/00_extradeps.sh22
-rwxr-xr-xdebian/_buildscripts/local/11_others_02.sh14
2 files changed, 18 insertions, 18 deletions
diff --git a/debian/_buildscripts/local/00_extradeps.sh b/debian/_buildscripts/local/00_extradeps.sh
index cc710ad9e..3f0f0891d 100755
--- a/debian/_buildscripts/local/00_extradeps.sh
+++ b/debian/_buildscripts/local/00_extradeps.sh
@@ -7,18 +7,18 @@ set_log_start
if [[ "$USE_PREBUILD_EXTRA_DEPS" = "y" ]]; then
echo -e "${CBrown}#### Use of pre-built extra dependency packages is currently configured. Nothing to do. ####\n${CNone}"
- echo "Use of pre-built extra dependency packages is currently configured. Nothing to do." >>"$LOG_BUILD_RESULT_FILENAME"
+ echo "Use of pre-built extra dependency packages is currently configured. Nothing to do." >>"$LOG_BUILD_RESULT_FILENAME"
else
- build_module "edeps/fireflies"
- build_module "edeps/imlib"
-# build_module "edeps/opensync" # deprecated - no longer required in R14.1 series. To remove in R14.2.0
- build_module "edeps/pcsc-lite-nodbus"
- build_module "edeps/lcms"
- build_module "edeps/wv2"
- build_module "edeps/jasper"
- build_module "edeps/openslp-dfsg"
- build_module "edeps/mp4v2"
- build_module "edeps/transcode"
+ build_module "$CFG_EXTRA_DEPS_DIR/fireflies"
+ build_module "$CFG_EXTRA_DEPS_DIR/imlib"
+# build_module "$CFG_EXTRA_DEPS_DIR/opensync" # deprecated - no longer required in R14.1 series. To remove in R14.2.0
+ build_module "$CFG_EXTRA_DEPS_DIR/pcsc-lite-nodbus"
+ build_module "$CFG_EXTRA_DEPS_DIR/lcms"
+ build_module "$CFG_EXTRA_DEPS_DIR/wv2"
+ build_module "$CFG_EXTRA_DEPS_DIR/jasper"
+ build_module "$CFG_EXTRA_DEPS_DIR/openslp-dfsg"
+ build_module "$CFG_EXTRA_DEPS_DIR/mp4v2"
+ build_module "$CFG_EXTRA_DEPS_DIR/transcode"
fi
set_log_end
diff --git a/debian/_buildscripts/local/11_others_02.sh b/debian/_buildscripts/local/11_others_02.sh
index d32da9a42..e8a900094 100755
--- a/debian/_buildscripts/local/11_others_02.sh
+++ b/debian/_buildscripts/local/11_others_02.sh
@@ -7,13 +7,13 @@ set_log_start
build_module "tde-i18n"
if [[ "$USE_PREBUILD_EXTRA_DEPS" != "y" ]]; then
- build_module "edeps/compiz-trinity"
- build_module "edeps/libcompizconfig-trinity"
- build_module "edeps/compiz-fusion-bcop-trinity"
- build_module "edeps/compiz-fusion-plugins-main-trinity"
- build_module "edeps/compiz-fusion-plugins-extra-trinity"
- build_module "edeps/compizconfig-python-trinity"
- build_module "edeps/pilot-link"
+ build_module "$CFG_EXTRA_DEPS_DIR/compiz-trinity"
+ build_module "$CFG_EXTRA_DEPS_DIR/libcompizconfig-trinity"
+ build_module "$CFG_EXTRA_DEPS_DIR/compiz-fusion-bcop-trinity"
+ build_module "$CFG_EXTRA_DEPS_DIR/compiz-fusion-plugins-main-trinity"
+ build_module "$CFG_EXTRA_DEPS_DIR/compiz-fusion-plugins-extra-trinity"
+ build_module "$CFG_EXTRA_DEPS_DIR/compizconfig-python-trinity"
+ build_module "$CFG_EXTRA_DEPS_DIR/pilot-link"
fi
build_module "applications/compizconfig-backend-tdeconfig"
build_module "applications/kpilot"