mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2025-06-07 21:55:04 +02:00
6c5d635940
Bug: https://bugs.gentoo.org/918985 Closes: https://bugs.gentoo.org/898838 Signed-off-by: Sam James <sam@gentoo.org>
64 lines
2.4 KiB
Diff
64 lines
2.4 KiB
Diff
--- a/makefile.in
|
|
+++ b/makefile.in
|
|
@@ -200,10 +200,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) $@ )
|
|
@@ -244,8 +244,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/*/*~
|
|
@@ -300,7 +300,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"; \
|
|
--- 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 \
|