From: Roland McGrath <roland@redhat.com>
Date: Thu, 20 Feb 2003 02:56:29 +0000 (+0000)
Subject: 2003-02-19  Roland McGrath  <roland@redhat.com>
X-Git-Tag: v4.5.18~819
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9c9a2534e361b683f1e4e08804b7166a01475bf1;p=strace

2003-02-19  Roland McGrath  <roland@redhat.com>

	* version.c: Removed.
	* Makefile.am (strace_SOURCES): Remove it.
	* strace.c: Use PACKAGE_NAME and VERSION macros instead of version var.
---

diff --git a/Makefile.am b/Makefile.am
index d53d8134..1272c7c1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,7 @@ ARCH		= @arch@
 AM_CFLAGS = $(WARNFLAGS)
 INCLUDES = -I$(OS)/$(ARCH) -I$(srcdir)/$(OS)/$(ARCH) -I$(OS) -I$(srcdir)/$(OS)
 
-strace_SOURCES = strace.c version.c syscall.c util.c desc.c file.c ipc.c \
+strace_SOURCES = strace.c syscall.c util.c desc.c file.c ipc.c \
 		 io.c ioctl.c mem.c net.c process.c bjm.c \
 		 resource.c signal.c sock.c system.c term.c time.c \
 		 proc.c stream.c
diff --git a/strace.c b/strace.c
index 61712454..8f70d34b 100644
--- a/strace.c
+++ b/strace.c
@@ -81,7 +81,6 @@ FILE *outf;
 struct tcb **tcbtab;
 unsigned int nprocs, tcbtabsize;
 char *progname;
-extern const char version[];
 extern char **environ;
 
 static int trace P((void));
@@ -247,7 +246,7 @@ char *argv[];
 			qualify("abbrev=none");
 			break;
 		case 'V':
-			printf("%s\n", version);
+			printf("%s -- version %s\n", PACKAGE_NAME, VERSION);
 			exit(0);
 			break;
 		case 'z':