Fri, 07 Sep 2012 19:08:07 +0200
Correct build configuration in Solaris subdir, correct english grammar,
remove irrelevant strip notice, introduce custom CFLAG logic, facilitate
use of Solaris Studio compiler with needed build configuration
adjustments, conditionally build 64 bit position independent code,
and accommodate tun(7) in newer Solaris releases by renaming driver
and module from conflicting 'tun' to 'vtun'. These changes include
some nonstandard 'I give up' logic causing out of tree builds by
manipulating the PATH, for example.
1 Index: Makefile.in
2 --- Makefile.in.orig 2007-05-29 14:01:04 +0200
3 +++ Makefile.in 2009-12-24 22:39:59 +0100
4 @@ -119,7 +119,7 @@
6 DEFUNS=$(top_srcdir)/main.c $(top_srcdir)/menu.c
7 SCRIPTSUBDIRS= scripts
8 -SUBDIRS = $(SCRIPTSUBDIRS) w3mimg libwc po
9 +SUBDIRS = $(SCRIPTSUBDIRS) w3mimg libwc
10 .PHONY: $(SUBDIRS)
12 all: $(TARGETS) all-scripts $(NLSTARGET)
13 @@ -134,7 +134,7 @@
14 $(OBJS) $(LOBJS): fm.h funcname1.h
16 tagtable.c: tagtable.tab mktable$(EXT) html.h
17 - ./mktable$(EXT) 100 $(srcdir)/tagtable.tab > $@
18 + -./mktable$(EXT) 100 $(srcdir)/tagtable.tab > $@
20 indep.o: indep.c fm.h funcname1.h
21 func.o: funcname.c functable.c funcname1.h
22 @@ -167,7 +167,7 @@
24 functable.c: funcname.tab mktable$(EXT)
25 sort funcname.tab | $(AWK) -f $(top_srcdir)/functable.awk > functable.tab
26 - ./mktable$(EXT) 100 functable.tab > $@
27 + -./mktable$(EXT) 100 functable.tab > $@
28 -rm -f functable.tab
30 mktable$(EXT): mktable.o dummy.o $(ALIB)
31 Index: main.c
32 --- main.c.orig 2007-05-31 03:19:50 +0200
33 +++ main.c 2009-12-25 10:21:26 +0100
34 @@ -842,7 +842,8 @@
35 mySignal(SIGPIPE, SigPipe);
36 #endif
38 - orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc);
39 + orig_GC_warn_proc = GC_get_warn_proc();
40 + GC_set_warn_proc(wrap_GC_warn_proc);
41 err_msg = Strnew();
42 if (load_argc == 0) {
43 /* no URL specified */