More streamlining of version number. Fixes problems with osx version …

…displayed.
ckolivas · Mar 21, 2011 · 68cca4d · 68cca4d
1 parent 131d4c9
commit 68cca4d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/configure.ac b/configure.ac
@@ -29,9 +29,9 @@ AC_PROG_LIBTOOL
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 m4_ifdef([v_rev], , [m4_define([v_rev], [0])])
 m4_ifdef([v_rel], , [m4_define([v_rel], [])])
-AC_DEFINE_UNQUOTED(VMAJ, [v_maj], [Major version])
-AC_DEFINE_UNQUOTED(VMIN, [v_min], [Minor version])
-AC_DEFINE_UNQUOTED(VMIC, [v_mic], [Micro version])
+AC_DEFINE_UNQUOTED(LRZIP_MAJOR_VERSION, [v_maj], [Major version])
+AC_DEFINE_UNQUOTED(LRZIP_MINOR_VERSION, [v_min], [Minor version])
+AC_DEFINE_UNQUOTED(LRZIP_MINOR_SUBVERSION, [v_mic], [Micro version])
 version_info="lt_rev:lt_cur:lt_age"
 release_info="v_rel"
 AC_SUBST(version_info)

diff --git a/lrzip_private.h b/lrzip_private.h
@@ -20,10 +20,6 @@
 #ifndef LRZIP_PRIV_H
 #define LRZIP_PRIV_H
 
-#define LRZIP_MAJOR_VERSION VMAJ
-#define LRZIP_MINOR_VERSION VMIN
-#define LRZIP_MINOR_SUBVERSION VMIC
-
 #define NUM_STREAMS 2
 #define STREAM_BUFSIZE (1024 * 1024 * 10)
 

diff --git a/main.c b/main.c
@@ -168,7 +168,7 @@ static rzip_control control;
 
 static void usage(void)
 {
-	print_output("lrzip version %d.%d%d\n", LRZIP_MAJOR_VERSION, LRZIP_MINOR_VERSION, LRZIP_MINOR_SUBVERSION);
+	print_output("lrzip version %s\n", PACKAGE_VERSION);
 	print_output("Copyright (C) Con Kolivas 2006-2011\n");
 	print_output("Based on rzip ");
 	print_output("Copyright (C) Andrew Tridgell 1998-2003\n\n");