mirror of
https://github.com/tmux/tmux.git
synced 2025-01-05 23:38:48 +00:00
Fix for version changes.
This commit is contained in:
parent
ee3d3db364
commit
685eb381de
@ -11,8 +11,9 @@ EXTRA_DIST = \
|
||||
dist_EXTRA_tmux_SOURCES = compat/*.[ch]
|
||||
|
||||
# Preprocessor flags.
|
||||
AM_CPPFLAGS += @XOPEN_DEFINES@
|
||||
AM_CPPFLAGS += -DTMUX_CONF="\"$(sysconfdir)/tmux.conf:~/.tmux.conf:~/.config/tmux/tmux.conf\""
|
||||
AM_CPPFLAGS += @XOPEN_DEFINES@ \
|
||||
-DTMUX_VERSION="\"@VERSION@\"" \
|
||||
-DTMUX_CONF="\"$(sysconfdir)/tmux.conf:~/.tmux.conf:~/.config/tmux/tmux.conf\""
|
||||
|
||||
# Additional object files.
|
||||
LDADD = $(LIBOBJS)
|
||||
|
1
input.c
1
input.c
@ -20,6 +20,7 @@
|
||||
|
||||
#include <netinet/in.h>
|
||||
|
||||
#include <ctype.h>
|
||||
#include <resolv.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
13
tmux.c
13
tmux.c
@ -213,15 +213,7 @@ find_home(void)
|
||||
const char *
|
||||
getversion(void)
|
||||
{
|
||||
static char *version;
|
||||
struct utsname u;
|
||||
|
||||
if (version == NULL) {
|
||||
if (uname(&u) < 0)
|
||||
fatalx("uname failed");
|
||||
xasprintf(&version, "openbsd-%s", u.release);
|
||||
}
|
||||
return version;
|
||||
return TMUX_VERSION;
|
||||
}
|
||||
|
||||
int
|
||||
@ -264,9 +256,6 @@ main(int argc, char **argv)
|
||||
else
|
||||
flags |= CLIENT_CONTROL;
|
||||
break;
|
||||
case 'V':
|
||||
printf("%s %s\n", getprogname(), VERSION);
|
||||
exit(0);
|
||||
case 'f':
|
||||
set_cfg_file(optarg);
|
||||
break;
|
||||
|
Loading…
Reference in New Issue
Block a user