summaryrefslogtreecommitdiffstats
path: root/scripts/lib/ptxd_make_world_common.sh
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2010-01-18 23:35:47 +0100
committerMarc Kleine-Budde <mkl@pengutronix.de>2010-01-19 10:56:09 +0100
commita044f2ad92eb424775e045ab135fa3fe699b979f (patch)
tree2a5602557f8390520c2b03699d5c3cae98eb5822 /scripts/lib/ptxd_make_world_common.sh
parent3897b46c24ef8f46a20d18e7bd4f8e543636de53 (diff)
downloadptxdist-a044f2ad92eb424775e045ab135fa3fe699b979f.tar.gz
ptxdist-a044f2ad92eb424775e045ab135fa3fe699b979f.tar.xz
[ptxd_make_world_common] add "_target" prefix to ptx_conf_* variables
This patch adds a "_target" prefix to the following variables: - ptx_conf_opt_autoconf - ptx_conf_opt_cmake - ptx_conf_opt_qmake This eases assignment of the default values quite a lot, espcially when adding support for host packages, which will follow in the next patches. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'scripts/lib/ptxd_make_world_common.sh')
-rw-r--r--scripts/lib/ptxd_make_world_common.sh15
1 files changed, 11 insertions, 4 deletions
diff --git a/scripts/lib/ptxd_make_world_common.sh b/scripts/lib/ptxd_make_world_common.sh
index da52f846a..f563ec24e 100644
--- a/scripts/lib/ptxd_make_world_common.sh
+++ b/scripts/lib/ptxd_make_world_common.sh
@@ -1,6 +1,7 @@
#!/bin/bash
#
-# Copyright (C) 2009 by Marc Kleine-Budde <mkl@pengutronix.de>
+# Copyright (C) 2009, 2010 by Marc Kleine-Budde <mkl@pengutronix.de>
+#
# See CREDITS for details about who has contributed to this project.
#
# For further information about the PTXdist project and license conditions
@@ -242,10 +243,16 @@ ptxd_make_world_init() {
pkg_conf_tool=${pkg_conf_tool}qmake
fi
fi
+
case "${pkg_conf_tool}" in
- autoconf) pkg_conf_opt="${pkg_conf_opt:-${ptx_conf_opt_autoconf}}";;
- cmake) pkg_conf_opt="${pkg_conf_opt:-${ptx_conf_opt_cmake}}";;
- qmake) pkg_conf_opt="${pkg_conf_opt:-${ptx_conf_opt_qmake}}";;
+ autoconf|cmake|qmake)
+ local conf_opt_ptr="ptx_conf_opt_${pkg_conf_tool}_${pkg_type}"
+
+ pkg_conf_opt="${pkg_conf_opt:-${!conf_opt_ptr}}"
+
+ unset conf_opt_ptr
+ ;;
+ *) ;;
esac
#