diff options
Diffstat (limited to 'Build/source/texk/cjkutils')
-rw-r--r-- | Build/source/texk/cjkutils/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/texk/cjkutils/Makefile.am | 2 | ||||
-rw-r--r-- | Build/source/texk/cjkutils/Makefile.in | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/Build/source/texk/cjkutils/ChangeLog b/Build/source/texk/cjkutils/ChangeLog index 2332196ce83..8897ee493b0 100644 --- a/Build/source/texk/cjkutils/ChangeLog +++ b/Build/source/texk/cjkutils/ChangeLog @@ -1,3 +1,7 @@ +2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Moved Makefile fragments to ../../am/. + 2013-02-08 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am (hbf2gf_cfgdir): Change texmf => texmf-dist. diff --git a/Build/source/texk/cjkutils/Makefile.am b/Build/source/texk/cjkutils/Makefile.am index e6dc65de597..4ef526b7e55 100644 --- a/Build/source/texk/cjkutils/Makefile.am +++ b/Build/source/texk/cjkutils/Makefile.am @@ -64,7 +64,7 @@ else !WIN32 bin_links = gbklatex:bg5+latex gbkpdflatex:bg5+pdflatex endif !WIN32 -include $(srcdir)/../am/bin_links.am +include $(srcdir)/../../am/bin_links.am gbklatex_SOURCES = \ @CJKUTILS_TREE@/cjklatex/cjklatex.c diff --git a/Build/source/texk/cjkutils/Makefile.in b/Build/source/texk/cjkutils/Makefile.in index 6a3338ca6d8..3120d986612 100644 --- a/Build/source/texk/cjkutils/Makefile.in +++ b/Build/source/texk/cjkutils/Makefile.in @@ -87,7 +87,7 @@ bin_PROGRAMS = bg5conv$(EXEEXT) cefconv$(EXEEXT) cef5conv$(EXEEXT) \ @WIN32_TRUE@ gbklatex \ @WIN32_TRUE@ gbkpdflatex -DIST_COMMON = $(srcdir)/../am/bin_links.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/../../am/bin_links.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am $(top_srcdir)/configure \ $(am__configure_deps) $(srcdir)/c-auto.in \ $(top_srcdir)/../../build-aux/depcomp \ @@ -662,7 +662,7 @@ all: c-auto.h .SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs am--refresh: Makefile @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../am/bin_links.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/bin_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -685,7 +685,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; -$(srcdir)/../am/bin_links.am: +$(srcdir)/../../am/bin_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck |