blob: 7e8d728ec8d2dd22dd84bced8c13d4f6abc5974b (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
|
diff --git a/makefile.in b/makefile.in
index 3c42a3e..81142f3 100644
--- a/makefile.in
+++ b/makefile.in
@@ -199,10 +199,10 @@ binary_PROG = $(actual_PROG)$x
all lynx$x: cfg_defs.h LYHelp.h
@MSG_DIR_MAKE@ $(SHELL) $(scripts_dir)/fixtext.sh $(srcdir)/LYMessages_en.h >LYMessages.c
-@MSG_DIR_MAKE@ ( cd $(PO_DIR) && $(MAKE_RECUR) )
- ( cd $(WWW_DIR) && $(MAKE_RECUR) $(WWW_CFLAGS) )
- ( cd $(CHR_DIR) && $(MAKE_RECUR) all $(CHR_CFLAGS) )
- ( cd $(SRC_DIR) && $(MAKE_RECUR) all $(SRC_CFLAGS) )
+@MSG_DIR_MAKE@ $(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(PO_DIR)
+ $(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(WWW_DIR) $(WWW_CFLAGS)
+ $(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(CHR_DIR) all $(CHR_CFLAGS)
+ $(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(SRC_DIR) all $(SRC_CFLAGS)
lint:
( cd $(WWW_DIR) && $(MAKE_RECUR) LINT="$(LINT)" $(WWW_CFLAGS) $@ )
@@ -243,8 +243,8 @@ clean:
rm -f core *.core
depend: cfg_defs.h LYHelp.h
- ( cd $(WWW_DIR) && $(MAKE_RECUR) $@ )
- ( cd $(SRC_DIR) && $(MAKE_RECUR) $@ )
+ $(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(WWW_DIR) $@
+ $(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(SRC_DIR) $@
distclean: clean
-rm -f WWW/Library/*/*~
@@ -299,7 +299,7 @@ install-full: install install-help install-doc
@echo "Full installation complete."
install-bin: $(BINDIR) lynx$x
-@MSG_DIR_MAKE@ ( cd $(PO_DIR) && $(MAKE_RECUR) install )
+@MSG_DIR_MAKE@ $(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(PO_DIR)
@ECHO_CC@$(SHELL) -c "P=$(binary_PROG); \
if test -f $(BINDIR)/$$P ; then \
mv -f $(BINDIR)/$$P $(BINDIR)/$$P.old; fi"; \
diff --git a/src/makefile.in b/src/makefile.in
index 5246226..c4347cc 100644
--- a/src/makefile.in
+++ b/src/makefile.in
@@ -117,13 +117,13 @@ message:
@echo "Compiling Lynx sources"
do_chartrans_stuff:
- -( cd chrtrans && $(MAKE_RECUR) \
+ $(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C chrtrans \
SITE_DEFS="$(SITE_DEFS)" \
BUILD_CFLAGS="$(BUILD_CFLAGS)" \
BUILD_CPPFLAGS="$(BUILD_CPPFLAGS)" \
BUILD_LDFLAGS="$(BUILD_LDFLAGS)" \
BUILD_LIBS="$(BUILD_LIBS)" \
- BUILD_CC="$(BUILD_CC)" tables )
+ BUILD_CC="$(BUILD_CC)" tables
lint:
$(LINT) $(LINTOPTS) $(CPP_OPTS) $(C_SRC) 2>&1 |tee $(top_builddir)/lint.lynx
@@ -209,7 +209,7 @@ TABLES= \
$(CHRTR)viscii_uni.h
$(TABLES):
- -( cd chrtrans && $(MAKE_RECUR) tables )
+ $(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C chrtrans tables
UCdomap$o : UCdomap.c \
chrtrans/UCkd.h \
|
