Control: tags -1 fixed-upstream On 2021-02-27 Andreas Metzler <[email protected]> wrote: > On 2021-02-21 Vagrant Cascadian <[email protected]> wrote: > [...] > > The lynx documentation has many differences between two builds: [...] > > All of the documentation differences disappeared for me when disabling > > parallelism in the build (and fixing the usrmerge issue reported in > > another bug). The attached patch passes --no-parallel to dh in
[...] > This patch (use a "Grouped Target") fixes the issue for me: > ----------- > --- lynx-2.9.0dev.6.orig/makefile.in > +++ lynx-2.9.0dev.6/makefile.in > @@ -338,7 +338,7 @@ LYNX_URL='@HOMEPAGE_URL@release/breakout > LYNXDOCS_URL='$(LYNX_URL)/docs/' > LYNXHELP_URL='$(LYNX_URL)/lynx_help/' > -@LYNXCFG_MAKE@$(CFG2HTML) : > +@LYNXCFG_MAKE@$(CFG2HTML) &: [...] > Not sure whether it is upstreamable, since &: is a probably a > GNU-make-ism. Hello, upstream has fixed this in a BSD-make compatible way https://github.com/ThomasDickey/lynx-snapshots/commit/f100e91840bc2ef2cecf3d0975b734e53637fa55 (stripped patch attached for reference) So it will be part of the next upstream release. For Debian I think we will temporarily use the one-line GNU-make-only fix. cu Andreas -- `What a good friend you are to him, Dr. Maturin. His other friends are so grateful to you.' `I sew his ears on from time to time, sure'
--- lynx-2.9.0dev.6.orig/aclocal.m4 +++ lynx-2.9.0dev.6/aclocal.m4 @@ -3914,6 +3914,89 @@ CF_EOF AC_SUBST(cf_cv_makeflags) ])dnl dnl --------------------------------------------------------------------------- +dnl CF_MAKE_PHONY version: 3 updated: 2021/01/08 16:08:21 +dnl ------------- +dnl Check if the make-program handles a ".PHONY" target, e.g,. a target which +dnl acts as a placeholder. +dnl +dnl The ".PHONY" feature was proposed in 2011 here +dnl https://www.austingroupbugs.net/view.php?id=523 +dnl and is scheduled for release in P1003.1 Issue 8 (late 2022). +dnl +dnl This is not supported by SVr4 make (or SunOS 4, 4.3SD, etc), but works with +dnl a few others (i.e., GNU make and the non-POSIX "BSD" make): +dnl +dnl + This is a GNU make feature (since April 1988, but in turn from binutils, +dnl date unspecified). +dnl +dnl + It was adopted in NetBSD make in June 1995. +dnl +dnl + The other BSD make programs are derived from the NetBSD make (and for +dnl that reason are not actually different "implementations"). +dnl +dnl + Some features of NetBSD make were actually adapted from pmake, which +dnl began as a modified GNU make starting in 1993. +dnl +dnl + Version 3.8 of the dmake program in January 1992 also implemented this +dnl GNU make extension, but is less well known than the BSD make. +AC_DEFUN([CF_MAKE_PHONY],[ +AC_CACHE_CHECK(for \".PHONY\" make-support, cf_cv_make_PHONY,[ + rm -rf conftest* + ( + mkdir conftest || exit 1 + cd conftest + cat >makefile <<'CF_EOF' +.PHONY: always +DATA=0 +always: always.out + @echo "** making [$]@ [$](DATA)" +once: once.out + @echo "** making [$]@ [$](DATA)" +always.out: + @echo "** making [$]@ [$](DATA)" + echo [$](DATA) > [$]@ +once.out: + @echo "** making [$]@ [$](DATA)" + echo [$](DATA) > [$]@ +CF_EOF + for cf_data in 1 2 3 + do + ${MAKE:-make} always DATA=$cf_data + ${MAKE:-make} once DATA=$cf_data + ${MAKE:-make} -t always once + if test -f always ; then + echo "no (case 1)" > ../conftest.tmp + elif test ! -f always.out ; then + echo "no (case 2)" > ../conftest.tmp + elif test ! -f once.out ; then + echo "no (case 3)" > ../conftest.tmp + elif ! cmp -s always.out once.out ; then + echo "no (case 4)" > ../conftest.tmp + diff always.out once.out + else + cf_check="`cat always.out`" + if test "x$cf_check" != "x$cf_data" ; then + echo "no (case 5)" > ../conftest.tmp + else + echo yes > ../conftest.tmp + rm -f ./*.out + continue + fi + fi + break + done + ) >&AC_FD_CC 2>&1 + cf_cv_make_PHONY="`cat conftest.tmp`" + rm -rf conftest* +]) +MAKE_NO_PHONY="#" +MAKE_PHONY="#" +test "x$cf_cv_make_PHONY" = xyes && MAKE_PHONY= +test "x$cf_cv_make_PHONY" != xyes && MAKE_NO_PHONY= +AC_SUBST(MAKE_NO_PHONY) +AC_SUBST(MAKE_PHONY) +])dnl +dnl --------------------------------------------------------------------------- dnl CF_MAKE_TAGS version: 6 updated: 2010/10/23 15:52:32 dnl ------------ dnl Generate tags/TAGS targets for makefiles. Do not generate TAGS if we have --- lynx-2.9.0dev.6.orig/configure.in +++ lynx-2.9.0dev.6/configure.in @@ -108,6 +108,7 @@ AC_PROG_INSTALL AC_PROG_YACC CF_PROG_LINT CF_MAKEFLAGS +CF_MAKE_PHONY CF_MAKE_TAGS CF_ACVERSION_CHECK(2.52, @@ -633,10 +634,14 @@ CF_ARG_ENABLE(htmlized-cfg, AC_MSG_RESULT($use_htmlized_cfg) LYNXCFG_MAKE='' +LYNXCFG_NO_MAKE='' if test $use_htmlized_cfg = no ; then LYNXCFG_MAKE='#' +else + LYNXCFG_NO_MAKE='#' fi AC_SUBST(LYNXCFG_MAKE) +AC_SUBST(LYNXCFG_NO_MAKE) dnl -------------------------------------------------------------------------- AC_MSG_CHECKING(if local doc directory should be linked to help page) --- lynx-2.9.0dev.6.orig/makefile.in +++ lynx-2.9.0dev.6/makefile.in @@ -199,20 +199,20 @@ 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@ ( 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) ) lint: - cd $(WWW_DIR) && $(MAKE_RECUR) LINT="$(LINT)" $(WWW_CFLAGS) $@ - cd $(SRC_DIR) && $(MAKE_RECUR) LINT="$(LINT)" $(SRC_CFLAGS) $@ - cd $(CHR_DIR) && $(MAKE_RECUR) LINT="$(LINT)" $@ + ( cd $(WWW_DIR) && $(MAKE_RECUR) LINT="$(LINT)" $(WWW_CFLAGS) $@ ) + ( cd $(SRC_DIR) && $(MAKE_RECUR) LINT="$(LINT)" $(SRC_CFLAGS) $@ ) + ( cd $(CHR_DIR) && $(MAKE_RECUR) LINT="$(LINT)" $@ ) tags: - cd $(WWW_DIR) && $(MAKE_RECUR) $(WWW_CFLAGS) $@ - cd $(SRC_DIR) && $(MAKE_RECUR) $(SRC_CFLAGS) $@ - cd $(CHR_DIR) && $(MAKE_RECUR) $@ + ( cd $(WWW_DIR) && $(MAKE_RECUR) $(WWW_CFLAGS) $@ ) + ( cd $(SRC_DIR) && $(MAKE_RECUR) $(SRC_CFLAGS) $@ ) + ( cd $(CHR_DIR) && $(MAKE_RECUR) $@ ) etags: $(ETAGS) *.[ch] */*.[ch] */*/*.[ch] */*/*/*.[ch] @@ -233,27 +233,27 @@ help: clean: rm -f WWW/Library/*/*.[aoib] rm -f WWW/Library/*/.created - cd $(WWW_DIR) && $(MAKE_RECUR) $@ - cd $(SRC_DIR) && $(MAKE_RECUR) $@ + ( cd $(WWW_DIR) && $(MAKE_RECUR) $@ ) + ( cd $(SRC_DIR) && $(MAKE_RECUR) $@ ) @MSG_DIR_MAKE@ rm -f LYMessages.c -@MSG_DIR_MAKE@ cd $(PO_DIR) && $(MAKE_RECUR) $@ +@MSG_DIR_MAKE@ ( cd $(PO_DIR) && $(MAKE_RECUR) $@ ) rm -f *.b $(SRC_DIR)/lynx$x *.leaks cfg_defs.h LYHelp.h lint.* @LYNXCFG_MAKE@ -rm -f $(CFG2HTML) rm -f help_files.sed rm -f core *.core depend: cfg_defs.h LYHelp.h - cd $(WWW_DIR) && $(MAKE_RECUR) $@ - cd $(SRC_DIR) && $(MAKE_RECUR) $@ + ( cd $(WWW_DIR) && $(MAKE_RECUR) $@ ) + ( cd $(SRC_DIR) && $(MAKE_RECUR) $@ ) distclean: clean -rm -f WWW/Library/*/*~ -rm -f WWW/Library/*/*.bak -rm -rf $(SRC_DIR)/obsolete - -cd $(WWW_DIR) && $(MAKE_RECUR) $@ - -cd $(SRC_DIR) && $(MAKE_RECUR) $@ - -cd $(CHR_DIR) && $(MAKE_RECUR) $@ -@MSG_DIR_MAKE@ cd $(PO_DIR) && $(MAKE_RECUR) $@ + -( cd $(WWW_DIR) && $(MAKE_RECUR) $@ ) + -( cd $(SRC_DIR) && $(MAKE_RECUR) $@ ) + -( cd $(CHR_DIR) && $(MAKE_RECUR) $@ ) +@MSG_DIR_MAKE@ -( cd $(PO_DIR) && $(MAKE_RECUR) $@ ) @MSG_DIR_MAKE@ -rmdir $(PO_DIR) -rm -f *~ *.bak *.sav tags TAGS -rm -f $(WWW_DIR)/makefile $(SRC_DIR)/makefile $(CHR_DIR)/makefile @@ -273,14 +273,14 @@ maintainer-clean: distclean REFDIR=orig/$(lynxdir) lynx.patch: $(top_srcdir) $(top_srcdir)/CHANGES - - cd $(top_srcdir)/.. && cd $(REFDIR) && { rm -f \ + -( cd $(top_srcdir)/.. && cd $(REFDIR) && { rm -f \ config.log \ config.status \ lynx_cfg.h \ ; \ for I in . $(SRC_DIR) $(WWW_DIR); do ( set +e; \ ( set -x; cd $$I && rm -f *.orig *.rej makefile ); : ); \ - done; } + done; } ) ( cd $(top_srcdir)/..; echo "%%% Created `date` by target $@. %%%"; \ if diff -bru /dev/null /dev/null; \ then diff -bru $(REFDIR) $(lynxdir); \ @@ -296,37 +296,42 @@ install: install-bin install-man install @echo install-full: install install-help install-doc - @echo Full installation complete. + @echo "Full installation complete." install-bin: $(BINDIR) lynx$x -@MSG_DIR_MAKE@ cd $(PO_DIR) && $(MAKE_RECUR) install +@MSG_DIR_MAKE@ ( cd $(PO_DIR) && $(MAKE_RECUR) install ) @ECHO_CC@$(SHELL) -c "P=$(binary_PROG); \ if test -f $(BINDIR)/$$P ; then \ - mv -f $(BINDIR)/$$P $(BINDIR)/$$P.old; fi" + mv -f $(BINDIR)/$$P $(BINDIR)/$$P.old; fi"; \ $(INSTALL_PROGRAM) lynx$x $(BINDIR)/$(binary_PROG) install-man : $(MANDIR) $(INSTALL_DATA) $(srcdir)/lynx.man $(MANDIR)/$(actual_PROG).1 install-doc : $(DOCDIR) $(HELPDIR) - @echo Copying sample files - $(SHELL) -c '\ + @echo "Copying sample files";\ + $(SHELL) -c 'set -x; \ ( umask 022; \ cd $(srcdir) && \ $(TAR_UP) C[HO]* PROBLEMS README docs samples test ) | \ ( umask 022; \ cd $(DOCDIR) && \ - chmod -R u+w . && $(TAR_DOWN) )' + chmod -R u+w . && $(TAR_DOWN) )';\ $(SHELL) -c 'if test "$(COMPRESS_PROG)" != "" ; then \ (cd $(DOCDIR) && $(COMPRESS_PROG) -f docs/CHANGES*.[0-9] docs/*.announce ) \ - fi' - $(SHELL) -c 'for name in COPYING COPYHEADER; do \ + fi';\ + $(SHELL) -c 'set -x; \ + for name in COPYING COPYHEADER; do \ cd $(HELPDIR) && rm -f $$name ;\ r= ;\ test "$(LN_S)" = "ln -s" || r=`echo $(helpdir)|sed -e "s%[^/]\+%..%g" -e "s%^.%%"`; \ cd $(HELPDIR) && ( $(LN_S) $$r$(docdir)/$$name . || cp $(DOCDIR)/$$name . );\ - done' - -$(SHELL) -c 'case `id|sed -e "s/(.*//"` in uid=0) chown -R root $(DOCDIR);; esac' + done';\ + $(SHELL) -c 'set -x; \ + case `id|sed -e "s/(.*//"` in \ + uid=0) \ + chown -R root $(DOCDIR);; \ + esac' # HPUX 'sed' does not seem to like '=' as pattern delimiter. # We cannot use '%' because it may appear in a URL. @@ -338,9 +343,14 @@ LYNX_URL='@HOMEPAGE_URL@release/breakout LYNXDOCS_URL='$(LYNX_URL)/docs/' LYNXHELP_URL='$(LYNX_URL)/lynx_help/' -@LYNXCFG_MAKE@$(CFG2HTML) : -@LYNXCFG_MAKE@ @echo 'Making htmlized lynx.cfg' -@LYNXCFG_MAKE@ cd $(SRC_DIR) && $(MAKE_RECUR) LYReadCFG.i +@LYNXCFG_NO_MAKE@htmlized_cfg: +@LYNXCFG_MAKE@@MAKE_NO_PHONY@htmlized_cfg: $(CFG2HTML) +@LYNXCFG_MAKE@@MAKE_NO_PHONY@$(CFG2HTML): +@LYNXCFG_MAKE@@[email protected]: htmlized_cfg +@LYNXCFG_MAKE@@MAKE_PHONY@$(CFG2HTML): htmlized_cfg +@LYNXCFG_MAKE@@MAKE_PHONY@htmlized_cfg: +@LYNXCFG_MAKE@ @echo "Making htmlized lynx.cfg" +@LYNXCFG_MAKE@ ( cd $(SRC_DIR) && $(MAKE_RECUR) LYReadCFG.i ) @LYNXCFG_MAKE@ @-rm -f $(CFG2HTML) @LYNXCFG_MAKE@ sed -n -e '/Config_Type *Config_Table/,/{0, *0, *0}/ p' $(SRC_DIR)/LYReadCFG.i | \ @LYNXCFG_MAKE@ sed -e 's/ *{ *"\([^"]*\)".*/\1/' | \ @@ -348,7 +358,7 @@ LYNXHELP_URL='$(LYNX_URL)/lynx_help/' @LYNXCFG_MAKE@ -rm -f $(SRC_DIR)/LYReadCFG.i help_files.sed : makefile $(srcdir)/lynx_help/help_files.txt - @echo Constructing sed-script $@ + @echo "Constructing sed-script $@" @-rm -f $@ help_files.tmp @cat $(srcdir)/lynx_help/help_files.txt > help_files.tmp @LYNXDOC_MAKE@ @ECHO_CC@echo 's!$(LYNXDOCS_URL)!file://$(docdir)/!g' >> help_files.tmp @@ -371,15 +381,15 @@ help_files.sed : makefile $(srcdir)/lynx @ECHO_CC@if test -n "$(COMPRESS_EXT)"; then echo "s%\\(\$(COMPRESS_EXT)\\)*\$(COMPRESS_EXT)%$(COMPRESS_EXT)%g" >> $@; fi @-rm -f help_files.tmp -install-help : $(CFG2HTML) help_files.sed $(HELPDIR) $(SYSCONFDIR) +install-help : htmlized_cfg help_files.sed $(HELPDIR) $(SYSCONFDIR) -$(SHELL) -c 'if cd "$(HELPDIR)" ; then \ WD=`pwd` ; \ TAIL=`basename "$(helpdir)"` ; \ HEAD=`echo "$$WD"|sed -e "s,/$${TAIL}$$,,"` ; \ test "x$$WD" != "x$$HEAD" && rm -fr * ; \ - fi' + fi';\ test -d $(HELPDIR)/keystrokes || mkdir $(HELPDIR)/keystrokes - @echo Translating/copying html files + @echo "Translating/copying html files" @LYNXCFG_MAKE@ @$(SHELL) -c 'for f in $(CFG2HTML) ; do \ @LYNXCFG_MAKE@ sed -f help_files.sed $$f > $(HELPDIR)/$$f ; \ @LYNXCFG_MAKE@ done' @@ -393,14 +403,14 @@ install-help : $(CFG2HTML) help_files.se if test "$(COMPRESS_PROG)" != "" ; then \ (cd $(HELPDIR) && $(COMPRESS_PROG) $$files ) \ fi' - @echo Updating $(sysconfdir)/lynx.cfg + @echo "Updating $(sysconfdir)/lynx.cfg" @ECHO_CC@$(SHELL) -c \ 'if test -f $(SYSCONFDIR)/lynx.cfg ; then \ mv $(SYSCONFDIR)/lynx.cfg $(SYSCONFDIR)/lynx.tmp ; \ else \ cp $(srcdir)/lynx.cfg $(SYSCONFDIR)/lynx.tmp ; \ fi' - @echo Updating $(sysconfdir)/lynx.cfg to point to installed help-files + @echo "Updating $(sysconfdir)/lynx.cfg to point to installed help-files" @ECHO_CC@sed -e '/^HELPFILE:http/s!^!#!' \ -e '/^#HELPFILE:file/s!#!!' \ $(SYSCONFDIR)/lynx.tmp | \ @@ -408,12 +418,12 @@ install-help : $(CFG2HTML) help_files.se $(SHELL) $(scripts_dir)/cfg_path.sh lynx_doc $(helpdir) | \ sed -e '/^HELPFILE:file/s!$$!$(COMPRESS_EXT)!' \ -e '/^HELPFILE:file/s!$(COMPRESS_EXT)$(COMPRESS_EXT)$$!$(COMPRESS_EXT)!' \ - >$(SYSCONFDIR)/lynx.cfg - chmod 644 $(SYSCONFDIR)/lynx.cfg - -rm -f $(SYSCONFDIR)/lynx.tmp + >$(SYSCONFDIR)/lynx.cfg ;\ + chmod 644 $(SYSCONFDIR)/lynx.cfg ;\ + rm -f $(SYSCONFDIR)/lynx.tmp LYHelp.h : help_files.sed $(srcdir)/LYHelp.hin - @echo Creating $@ + @echo "Creating $@" @sed -f help_files.sed $(srcdir)/LYHelp.hin > $@ @echo '**********************************************' @echo @@ -438,11 +448,11 @@ install-lss : $(SYSCONFDIR) @$(SHELL) $(scripts_dir)/install-lss.sh "$(INSTALL_DATA)" $(srcdir)/samples/lynx.lss $(SYSCONFDIR)/lynx.lss uninstall :: -@MSG_DIR_MAKE@ cd $(PO_DIR) && $(MAKE_RECUR) uninstall - -rm -f $(BINDIR)/$(binary_PROG) - -rm -f $(MANDIR)/$(actual_PROG).1 - -rm -f $(SYSCONFDIR)/lynx.cfg - -rm -f $(SYSCONFDIR)/lynx.lss +@MSG_DIR_MAKE@ ( cd $(PO_DIR) && $(MAKE_RECUR) uninstall ) + -rm -f $(BINDIR)/$(binary_PROG) ;\ + rm -f $(MANDIR)/$(actual_PROG).1 ;\ + rm -f $(SYSCONFDIR)/lynx.cfg ;\ + rm -f $(SYSCONFDIR)/lynx.lss uninstall \ uninstall-help :: @@ -460,8 +470,8 @@ uninstall-doc :: TAIL=`basename "$(docdir)"` ; \ HEAD=`echo "$$WD"|sed -e "s,/$${TAIL}$$,,"` ; \ test "x$$WD" != "x$$HEAD" && rm -rf "$(DOCDIR)"; \ - fi' - -$(SHELL) -c 'if test -d "$(HELPDIR)" ; then \ + fi' ;\ + $(SHELL) -c 'if test -d "$(HELPDIR)" ; then \ WD=`cd "$(HELPDIR)" && pwd` ; \ TAIL=`basename "$(helpdir)"` ; \ HEAD=`echo "$$WD"|sed -e "s,/'$${TAIL}'$$,,"` ; \ @@ -470,20 +480,20 @@ uninstall-doc :: fi' update-po: - rsync -Lrtvz translationproject.org::tp/latest/lynx/ $(PO_SRCDIR) - test -f $(PO_SRCDIR)/makefile && cd $(PO_SRCDIR) && $(MAKE_RECUR) $@ + rsync -Lrtvz translationproject.org::tp/latest/lynx/ $(PO_SRCDIR) ;\ + ( test -f $(PO_SRCDIR)/makefile && cd $(PO_SRCDIR) && $(MAKE_RECUR) $@ ) preinstall : - @ echo '' - @ echo '** Configuration summary for LYNX $(LYNX_VERSION):' - @ echo '' - @ echo ' program name: '$(actual_PROG) - @ echo '' - @ echo ' bin directory: '$(BINDIR) - @ echo ' config directory: '$(SYSCONFDIR) - @ echo ' man directory: '$(MANDIR) - @ echo ' help directory: '$(HELPDIR) - @ echo ' doc directory: '$(DOCDIR) + @ echo '' ;\ + echo '** Configuration summary for LYNX $(LYNX_VERSION):' ;\ + echo '' ;\ + echo ' program name: '$(actual_PROG) ;\ + echo '' ;\ + echo ' bin directory: '$(BINDIR) ;\ + echo ' config directory: '$(SYSCONFDIR) ;\ + echo ' man directory: '$(MANDIR) ;\ + echo ' help directory: '$(HELPDIR) ;\ + echo ' doc directory: '$(DOCDIR) $(BINDIR) \ $(MANDIR) \ --- lynx-2.9.0dev.6.orig/po/makefile.inn +++ lynx-2.9.0dev.6/po/makefile.inn @@ -153,7 +153,7 @@ $(srcdir)/stamp-cat-id: $(PACKAGE).pot rm -f $(srcdir)/cat-id-tbl.c; \ mv cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; \ fi - cd $(srcdir) && rm -f stamp-cat-id && echo timestamp > stamp-cat-id + ( cd $(srcdir) && rm -f stamp-cat-id && echo timestamp > stamp-cat-id ) install: install-exec install-data @@ -249,19 +249,19 @@ dist distdir: update-po $(DISTFILES) # GNU msgfmt -C option can also check for X/Open compat. check-po: - cd $(srcdir); \ + ( cd $(srcdir); \ catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ echo "$$lang:"; \ $(MSGFMT) -f -c -v $$lang.po; \ - done + done ) update-po: makefile $(MAKE) $(PACKAGE).pot PATH=`pwd`/../src:$$PATH; \ - cd $(srcdir); \ + ( cd $(srcdir); \ catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ @@ -275,7 +275,7 @@ update-po: makefile rm -f $$lang.po; \ mv $$lang.old.po $$lang.po; \ fi; \ - done + done ) POTFILES: POTFILES.in ( if test 'x$(srcdir)' != 'x.'; then \ @@ -291,9 +291,9 @@ POTFILES: POTFILES.in && mv $@-t $@ ) makefile: makefile.inn ../config.status POTFILES - cd .. \ + ( cd .. \ && CONFIG_FILES=$(subdir)/[email protected]:$(subdir)/[email protected] CONFIG_HEADERS= \ - $(SHELL) ./config.status + $(SHELL) ./config.status ) # Tell versions [3.59,3.63) of GNU make not to export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- lynx-2.9.0dev.6.orig/src/makefile.in +++ lynx-2.9.0dev.6/src/makefile.in @@ -117,20 +117,20 @@ message: @echo "Compiling Lynx sources" do_chartrans_stuff: - -cd chrtrans && $(MAKE_RECUR) \ + -( cd chrtrans && $(MAKE_RECUR) \ 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 clean: rm -f lynx$x core *.core *.leaks *.i *$o *.bak tags TAGS test_* - cd chrtrans && $(MAKE_RECUR) clean + ( cd chrtrans && $(MAKE_RECUR) clean ) tags: $(CTAGS) *.[ch] @@ -209,7 +209,7 @@ TABLES= \ $(CHRTR)viscii_uni.h $(TABLES): - -cd chrtrans && $(MAKE_RECUR) tables + -( cd chrtrans && $(MAKE_RECUR) tables ) UCdomap$o : UCdomap.c \ chrtrans/UCkd.h \ @@ -218,7 +218,7 @@ UCdomap$o : UCdomap.c \ UCdomap.h $(CMN)UCMap.h $(TABLES) $(top_srcdir)/userdefs.h chrtrans/makeuctb$(BUILD_EXEEXT): - cd chrtrans && $(MAKE_RECUR) makeuctb$(BUILD_EXEEXT) + ( cd chrtrans && $(MAKE_RECUR) makeuctb$(BUILD_EXEEXT) ) UCAux$o : UCAux.c $(CMN)UCAux.h $(CMN)UCDefs.h LYCookie$o : $(top_srcdir)/userdefs.h
