summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2007-08-02 18:06:22 +0000
committerThierry Vignaud <tv@mandriva.org>2007-08-02 18:06:22 +0000
commit35328ee96437da07bc6cf8d4e16b4de34e71bd83 (patch)
tree17fa805e8e6f1a92d309a6c128a2e38deb266964
parentc0ed06c92c9e7bd99463d00ed6575475619f58d7 (diff)
downloaddrakx-35328ee96437da07bc6cf8d4e16b4de34e71bd83.tar
drakx-35328ee96437da07bc6cf8d4e16b4de34e71bd83.tar.gz
drakx-35328ee96437da07bc6cf8d4e16b4de34e71bd83.tar.bz2
drakx-35328ee96437da07bc6cf8d4e16b4de34e71bd83.tar.xz
drakx-35328ee96437da07bc6cf8d4e16b4de34e71bd83.zip
report real version on --help, set by Makefie
-rw-r--r--perl-install/Makefile.drakxtools1
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/standalone.pm5
3 files changed, 7 insertions, 1 deletions
diff --git a/perl-install/Makefile.drakxtools b/perl-install/Makefile.drakxtools
index 049eff3dc..73852775b 100644
--- a/perl-install/Makefile.drakxtools
+++ b/perl-install/Makefile.drakxtools
@@ -26,6 +26,7 @@ $(DIRS):
[ ! -e $@/Makefile ] || $(MAKE) -C $@
install:
+ perl -pi -e "s/\"VER\"(; # version)/\"$(VERSION)\"\1/" standalone.pm
mkdir -p $(BINDEST) $(ETCDEST) $(SBINDEST) $(DATADIR)/{harddrake,pixmaps,icons/{large,mini},autostart} $(PIXDIR) $(INITDIR) $(MENUDIR)
install -d $(INLIBDEST_DIRS:%=$(LIBDEST)/%)
install $(STANDALONEPMS) standalone/service_harddrake.sh standalone/convert $(SBINDEST)
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 66c3a9785..e17460d0c 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- report real version on --help
+
Version 10.4.156 - 02 August 2007, by Thierry Vignaud
- localedrake:
diff --git a/perl-install/standalone.pm b/perl-install/standalone.pm
index 721a22bd0..dc8339662 100644
--- a/perl-install/standalone.pm
+++ b/perl-install/standalone.pm
@@ -133,9 +133,12 @@ sub __exit {
}
+sub real_version {
+ return "VER"; # version automatically set from Makefile
+}
sub version() {
- print 'Drakxtools version 10
+ print 'Drakxtools version ' . real_version() . '
Copyright (C) 1999-2006 Mandriva by <install@mandriva.com>
', $::license, "\n";
}