diff options
Diffstat (limited to 'Build/source/m4')
-rw-r--r-- | Build/source/m4/kpse-common.m4 | 14 | ||||
-rw-r--r-- | Build/source/m4/kpse-ptexenc-flags.m4 | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Build/source/m4/kpse-common.m4 b/Build/source/m4/kpse-common.m4 index 1135e3e3637..977b522e7b4 100644 --- a/Build/source/m4/kpse-common.m4 +++ b/Build/source/m4/kpse-common.m4 @@ -110,23 +110,23 @@ else AS_TR_CPP($1)[_LIBS=`echo '$5' | sed \ -e "s,BLD/,$kpse_BLD/,g"` $6] - m4_if([$1], [kpathsea], + m4_if(m4_index([ kpathsea ptexenc ], [ $1 ]), [-1], [AS_TR_CPP($1)[_DEPEND=`echo '$5' | sed \ - -e 's,BLD/texk/,${top_builddir}/../,g'`] + -e 's,BLD/,${top_builddir}/../../,g'`] AS_TR_CPP($1)[_RULE='# Rebuild lib$2 $(]AS_TR_CPP($1)[_DEPEND):]m4_ifval([$7], [[ $7]])m4_ifval([$8], [[ $8 - cd ${top_builddir}/../$1 && $(MAKE) $(AM_MAKEFLAGS) rebuild + cd ${top_builddir}/../../libs/$1 && $(MAKE) $(AM_MAKEFLAGS) rebuild $8:]])[ - cd ${top_builddir}/../$1 && $(MAKE) $(AM_MAKEFLAGS) rebuild']], + cd ${top_builddir}/../../libs/$1 && $(MAKE) $(AM_MAKEFLAGS) rebuild']], [AS_TR_CPP($1)[_DEPEND=`echo '$5' | sed \ - -e 's,BLD/,${top_builddir}/../../,g'`] + -e 's,BLD/texk/,${top_builddir}/../,g'`] AS_TR_CPP($1)[_RULE='# Rebuild lib$2 $(]AS_TR_CPP($1)[_DEPEND):]m4_ifval([$7], [[ $7]])m4_ifval([$8], [[ $8 - cd ${top_builddir}/../../libs/$1 && $(MAKE) $(AM_MAKEFLAGS) rebuild + cd ${top_builddir}/../$1 && $(MAKE) $(AM_MAKEFLAGS) rebuild $8:]])[ - cd ${top_builddir}/../../libs/$1 && $(MAKE) $(AM_MAKEFLAGS) rebuild']]) + cd ${top_builddir}/../$1 && $(MAKE) $(AM_MAKEFLAGS) rebuild']]) m4_if(m4_index([ $3 ], [ tree ]), [-1], [fi ])[]dnl m4_if diff --git a/Build/source/m4/kpse-ptexenc-flags.m4 b/Build/source/m4/kpse-ptexenc-flags.m4 index 0c75e64fe80..32b467bdabe 100644 --- a/Build/source/m4/kpse-ptexenc-flags.m4 +++ b/Build/source/m4/kpse-ptexenc-flags.m4 @@ -1,5 +1,5 @@ # Public macros for the TeX Live (TL) tree. -# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +# Copyright (C) 2010 Peter Breitenlohner <tex-live@tug.org> # # This file is free software; the copyright holder # gives unlimited permission to copy and/or distribute it, |