| rev |
line source |
|
erjo@2904
|
1 --- multitail-5.2.2.ori/Makefile Mon May 19 11:19:09 2008
|
|
erjo@2904
|
2 +++ multitail-5.2.2/Makefile Wed May 6 15:37:03 2009
|
|
erjo@2904
|
3 @@ -6,7 +6,7 @@
|
|
erjo@2904
|
4 DEBUG=-g # -D_DEBUG # -pg # -D_DEBUG #-pg -W -pedantic # -pg #-fprofile-arcs
|
|
erjo@2904
|
5 LDFLAGS+=-lpanel -lncurses -lutil -lm $(DEBUG) -rdynamic
|
|
erjo@2904
|
6 # LDFLAGS+=-lc_p -lpanel_g -lncurses_g -lutil -lm -pg -g -rdynamic
|
|
erjo@2904
|
7 -CFLAGS+=-funsigned-char -D`uname` -O2 -Wall -DVERSION=\"$(VERSION)\" $(DEBUG) -DCONFIG_FILE=\"$(CONFIG_FILE)\"
|
|
erjo@2904
|
8 +CFLAGS+=-funsigned-char -D`uname` -D__Busybox__ -O2 -Wall -DVERSION=\"$(VERSION)\" $(DEBUG) -DCONFIG_FILE=\"$(CONFIG_FILE)\"
|
|
erjo@2904
|
9
|
|
erjo@2904
|
10 OBJS=utils.o mt.o error.o my_pty.o term.o scrollback.o help.o mem.o cv.o selbox.o stripstring.o color.o misc.o ui.o exec.o diff.o config.o cmdline.o globals.o history.o
|
|
erjo@2904
|
11
|
|
erjo@2904
|
12 --- multitail-5.2.2.ori/exec.c Mon May 19 11:19:09 2008
|
|
erjo@2904
|
13 +++ multitail-5.2.2/exec.c Wed May 6 15:34:59 2009
|
|
erjo@2904
|
14 @@ -77,13 +77,15 @@
|
|
erjo@2904
|
15 posix_version = getenv("_POSIX2_VERSION");
|
|
erjo@2904
|
16
|
|
erjo@2904
|
17 /* follow filename is only supported on *BSD and Linux */
|
|
erjo@2904
|
18 -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(linux) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__GNU__)
|
|
erjo@2904
|
19 +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(linux) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__GNU__) || defined(__Busybox__)
|
|
erjo@2904
|
20 if (follow_filename)
|
|
erjo@2904
|
21 {
|
|
erjo@2904
|
22 -#if defined(linux) || defined(__CYGWIN__) || defined(__GNU__)
|
|
erjo@2904
|
23 +#if !defined(__Busybox__) && (defined(linux) || defined(__CYGWIN__) || defined(__GNU__))
|
|
erjo@2904
|
24 pars[npars++] = "--follow=name";
|
|
erjo@2904
|
25 #elif defined(__OpenBSD__)
|
|
erjo@2904
|
26 pars[npars++] = "-f";
|
|
erjo@2904
|
27 +#elif defined(__Busybox__)
|
|
erjo@2904
|
28 + pars[npars++] = "-f";
|
|
erjo@2904
|
29 #else
|
|
erjo@2904
|
30 pars[npars++] = "-F";
|
|
erjo@2904
|
31 #endif
|
|
erjo@2904
|
32 @@ -95,7 +97,7 @@
|
|
erjo@2904
|
33 else
|
|
erjo@2904
|
34 #endif
|
|
erjo@2904
|
35 {
|
|
erjo@2904
|
36 -#if !defined(linux) && !defined(__CYGWIN__) && !defined(__GNU__)
|
|
erjo@2904
|
37 +#if !defined(linux) && !defined(__CYGWIN__) && !defined(__GNU__) && !defined(__Busybox__)
|
|
erjo@2904
|
38 if (follow_filename && gnu_tail)
|
|
erjo@2904
|
39 pars[npars++] = "--follow=name";
|
|
erjo@2904
|
40 #endif
|