summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2009-12-24 22:30:04 +0100
committerMarc Kleine-Budde <mkl@pengutronix.de>2009-12-25 00:31:17 +0100
commit8b08ef283426cc915c92a71ab79d415e425d4684 (patch)
tree9c5affa6c9548a97a561b98e0e2498270e52811a /scripts
parentad252008f24d2ebce0e63240b980e8894159e4f1 (diff)
downloadptxdist-8b08ef283426cc915c92a71ab79d415e425d4684.tar.gz
ptxdist-8b08ef283426cc915c92a71ab79d415e425d4684.tar.xz
version cleanups
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/libptxdist.sh11
-rw-r--r--scripts/ptxdist_version.sh.in8
2 files changed, 9 insertions, 10 deletions
diff --git a/scripts/libptxdist.sh b/scripts/libptxdist.sh
index 23e3e93db..13ac2a28b 100644
--- a/scripts/libptxdist.sh
+++ b/scripts/libptxdist.sh
@@ -271,7 +271,11 @@ ptxd_kconfig() {
local conf="${PTXDIST_TOPDIR}/scripts/kconfig/conf"
local mconf="${PTXDIST_TOPDIR}/scripts/kconfig/mconf"
- export KCONFIG_NOTIMESTAMP="1"
+ export \
+ KCONFIG_NOTIMESTAMP="1" \
+ PROJECT="ptxdist" \
+ FULLVERSION="${PTXDIST_VERSION_FULL}"
+
case "${config}" in
menuconfig)
"${mconf}" "${file_kconfig}"
@@ -312,7 +316,10 @@ ptxd_kconfig() {
esac
local retval=${?}
- unset KCONFIG_NOTIMESTAMP
+ unset \
+ KCONFIG_NOTIMESTAMP \
+ PROJECT \
+ FULLVERSION
if [ ${retval} -eq 0 -a "${copy_back}" = "true" ]; then
cp -- .config "${file_dotconfig}" || return
diff --git a/scripts/ptxdist_version.sh.in b/scripts/ptxdist_version.sh.in
index 6e2abfdbf..dea466fbb 100644
--- a/scripts/ptxdist_version.sh.in
+++ b/scripts/ptxdist_version.sh.in
@@ -2,14 +2,6 @@
#
# Version Definitions for PTXdist
#
-
-PROJECT=PTXdist
-FULLVERSION=@PACKAGE_VERSION@
-VERSION=@VERSION_MAJOR@
-PATCHLEVEL=@VERSION_MINOR@
-SUBLEVEL=@VERSION_MICRO@
-EXTRAVERSION=@VERSION_EXTRA_SEP@@VERSION_EXTRA@
-
PTXDIST_VERSION_FULL=@PACKAGE_VERSION@
PTXDIST_VERSION_MAJOR=@VERSION_MAJOR@
PTXDIST_VERSION_MINOR=@VERSION_MINOR@