diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-05-21 07:51:41 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-05-21 07:51:41 +0000 |
| commit | a5a98005f0e6fa8f756d8d17c697a5c9c2cdd845 (patch) | |
| tree | 3161462462fbeeea8d0136f0afb585b8ef830938 /Build/source/texk/mendexk | |
| parent | cfa39878481410fe63d2d11afaa18fc74cb4a863 (diff) | |
reorg ptexenc includes
fix some build rules
remove obsolete files
git-svn-id: svn://tug.org/texlive/trunk@18399 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/mendexk')
| -rw-r--r-- | Build/source/texk/mendexk/Makefile.am | 2 | ||||
| -rw-r--r-- | Build/source/texk/mendexk/Makefile.in | 2 | ||||
| -rwxr-xr-x | Build/source/texk/mendexk/configure | 6 |
3 files changed, 4 insertions, 6 deletions
diff --git a/Build/source/texk/mendexk/Makefile.am b/Build/source/texk/mendexk/Makefile.am index 1fc993214f8..bf5fe2dda07 100644 --- a/Build/source/texk/mendexk/Makefile.am +++ b/Build/source/texk/mendexk/Makefile.am @@ -5,7 +5,7 @@ ## ACLOCAL_AMFLAGS = -I ../../m4 -INCLUDES = $(KPATHSEA_INCLUDES) $(PTEXENC_INCLUDES) +INCLUDES = $(PTEXENC_INCLUDES) $(KPATHSEA_INCLUDES) AM_CPPFLAGS = -DKPATHSEA -DKPATHSEA3 AM_CFLAGS = $(WARNING_CFLAGS) diff --git a/Build/source/texk/mendexk/Makefile.in b/Build/source/texk/mendexk/Makefile.in index 72f12f9b11d..0114f795a36 100644 --- a/Build/source/texk/mendexk/Makefile.in +++ b/Build/source/texk/mendexk/Makefile.in @@ -251,7 +251,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 -INCLUDES = $(KPATHSEA_INCLUDES) $(PTEXENC_INCLUDES) +INCLUDES = $(PTEXENC_INCLUDES) $(KPATHSEA_INCLUDES) AM_CPPFLAGS = -DKPATHSEA -DKPATHSEA3 AM_CFLAGS = $(WARNING_CFLAGS) mendex_SOURCES = \ diff --git a/Build/source/texk/mendexk/configure b/Build/source/texk/mendexk/configure index 71a873a311b..b53c22232b4 100755 --- a/Build/source/texk/mendexk/configure +++ b/Build/source/texk/mendexk/configure @@ -13252,7 +13252,7 @@ if test "x$with_ptexenc_libdir" != x && test "x$with_ptexenc_libdir" != xyes; th PTEXENC_LIBS="-L$with_ptexenc_libdir $PTEXENC_LIBS" fi else - PTEXENC_INCLUDES=`echo '-IBLD/texk -ISRC/texk' | sed \ + PTEXENC_INCLUDES=`echo '-IBLD/texk/ptexenc -ISRC/texk/ptexenc' | sed \ -e "s,SRC/,$kpse_SRC/,g" \ -e "s,BLD/,$kpse_BLD/,g"` PTEXENC_LIBS=`echo 'BLD/texk/ptexenc/libptexenc.la' | sed \ @@ -13261,9 +13261,7 @@ else PTEXENC_DEPEND=`echo 'BLD/texk/ptexenc/libptexenc.la' | sed \ -e 's,BLD/texk/,${top_builddir}/../,g'` PTEXENC_RULE='# Rebuild libptexenc -$(PTEXENC_DEPEND): ${top_srcdir}/../ptexenc/*.[ch] ${top_builddir}/../ptexenc/ptexenc.h - cd ${top_builddir}/../ptexenc && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../ptexenc/ptexenc.h: +$(PTEXENC_DEPEND): ${top_srcdir}/../ptexenc/*.c ${top_srcdir}/../ptexenc/ptexenc/*.h cd ${top_builddir}/../ptexenc && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi |