texk/web2c: Better rules for *tex_version.h

git-svn-id: svn://tug.org/texlive/trunk@29286 c570f23f-e606-0410-a88d-b1316a301751

14 files changed, 74 insertions, 50 deletions

diff --git a/Build/source/libs/freetype2/freetype-2.4.11-PATCHES/ChangeLog b/Build/source/libs/freetype2/freetype-2.4.11-PATCHES/ChangeLog
index 65096c7e872..5865e2a4bb7 100644
--- a/Build/source/libs/freetype2/freetype-2.4.11-PATCHES/ChangeLog
+++ b/Build/source/libs/freetype2/freetype-2.4.11-PATCHES/ChangeLog
@@ -2,7 +2,7 @@
 
 	* patch-02-DISABLE_OLD_INTERNALS (new): Build FreeType without
 	FT_CONFIG_OPTION_OLD_INTERNALS to fix a bug in loading some Mac fonts.
-	This is the efault in the next FreeTYpe release.
+	This is the default in the next FreeType release.
 
 2013-01-02  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 201ffa7293b..f474c229fdc 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -10886,10 +10886,9 @@ etex-tangle: tangle$(EXEEXT) etex.web etex.ch tangle-sh
 	@$(texmf_tangle) etex etex
 
 # Extract etex version
-etexdir/etex_version.h: etexdir/etex.ch
-	$(AM_V_at)$(MKDIR_P) etexdir
-	$(AM_V_GEN)grep '^@d eTeX_version_string==' $(srcdir)/etexdir/etex.ch \
-	  | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@
+$(srcdir)/etexdir/etex_version.h: etexdir/etex.ch
+@MAINTAINER_MODE_TRUE@	$(AM_V_GEN)grep '^@d eTeX_version_string==' $(srcdir)/etexdir/etex.ch \
+@MAINTAINER_MODE_TRUE@	  | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@
 
 # Generate etex.web
 etex.web: tie$(EXEEXT) $(etex_web_srcs)
@@ -10924,10 +10923,9 @@ ptex-tangle: tangle$(EXEEXT) ptex.web ptex.ch tangle-sh
 	@$(texmf_tangle) ptex ptex
 
 # Extract ptex version
-ptexdir/ptex_version.h: ptexdir/ptex-base.ch
-	$(AM_V_at)$(MKDIR_P) ptexdir
-	$(AM_V_GEN)grep '^@d pTeX_version_string==' $(srcdir)/ptexdir/ptex-base.ch \
-	  | sed "s/^.*'-/#define PTEX_VERSION \"/;s/'.*$$/\"/" >$@
+$(srcdir)/ptexdir/ptex_version.h: ptexdir/ptex-base.ch
+@MAINTAINER_MODE_TRUE@	$(AM_V_GEN)grep '^@d pTeX_version_string==' $(srcdir)/ptexdir/ptex-base.ch \
+@MAINTAINER_MODE_TRUE@	  | sed "s/^.*'-/#define PTEX_VERSION \"/;s/'.*$$/\"/" >$@
 
 # Generate ptex.web
 ptex.web: tie$(EXEEXT) $(ptex_web_srcs)
@@ -10990,10 +10988,9 @@ eptex-tangle: tangle$(EXEEXT) eptex.web eptex.ch tangle-sh
 	@$(texmf_tangle) eptex eptex
 
 # Extract eptex version
-eptexdir/eptex_version.h: eptexdir/eptex.ech
-	$(AM_V_at)$(MKDIR_P) eptexdir
-	$(AM_V_GEN)grep '^@d epTeX_version_string==' $(srcdir)/eptexdir/eptex.ech \
-	  | sed "s/^.*'-/#define EPTEX_VERSION \"/;s/'.*$$/\"/" >$@
+$(srcdir)/eptexdir/eptex_version.h: eptexdir/eptex.ech
+@MAINTAINER_MODE_TRUE@	$(AM_V_GEN)grep '^@d epTeX_version_string==' $(srcdir)/eptexdir/eptex.ech \
+@MAINTAINER_MODE_TRUE@	  | sed "s/^.*'-/#define EPTEX_VERSION \"/;s/'.*$$/\"/" >$@
 
 # Generate eptex.web
 eptex.web: tie$(EXEEXT) $(eptex_web_srcs)
@@ -11024,10 +11021,9 @@ uptex-tangle: tangle$(EXEEXT) uptex.web uptex.ch tangle-sh
 	@$(texmf_tangle) uptex uptex
 
 # Extract uptex version
-uptexdir/uptex_version.h: uptexdir/uptex-m.ch
-	$(AM_V_at)$(MKDIR_P) uptexdir
-	$(AM_V_GEN)grep '^@d upTeX_version_string==' $(srcdir)/uptexdir/uptex-m.ch \
-	  | sed "s/^.*'-/#define UPTEX_VERSION \"/;s/'.*$$/\"/" >$@
+$(srcdir)/uptexdir/uptex_version.h: uptexdir/uptex-m.ch
+@MAINTAINER_MODE_TRUE@	$(AM_V_GEN)grep '^@d upTeX_version_string==' $(srcdir)/uptexdir/uptex-m.ch \
+@MAINTAINER_MODE_TRUE@	  | sed "s/^.*'-/#define UPTEX_VERSION \"/;s/'.*$$/\"/" >$@
 
 # Generate uptex.web
 uptex.web: tie$(EXEEXT) $(uptex_web_srcs)
@@ -11114,16 +11110,14 @@ pdftex-pool.c: pdftex.pool pdftexd.h $(makecpool_stamp)
 	$(makecpool) pdftex >$@ || rm -f $@
 
 # Extract pdftex version
-pdftexdir/pdftex_version.h: pdftexdir/pdftex.web
-	$(AM_V_at)$(MKDIR_P) pdftexdir
-	$(AM_V_GEN)grep '^@d pdftex_version_string==' $(srcdir)/pdftexdir/pdftex.web \
-	  | sed "s/^.*'-/#define PDFTEX_VERSION \"/;s/'.*$$/\"/" >$@
+$(srcdir)/pdftexdir/pdftex_version.h: pdftexdir/pdftex.web
+@MAINTAINER_MODE_TRUE@	$(AM_V_GEN)grep '^@d pdftex_version_string==' $(srcdir)/pdftexdir/pdftex.web \
+@MAINTAINER_MODE_TRUE@	  | sed "s/^.*'-/#define PDFTEX_VERSION \"/;s/'.*$$/\"/" >$@
 
 # Extract etex version
-pdftexdir/etex_version.h: pdftexdir/pdftex.web
-	$(AM_V_at)$(MKDIR_P) pdftexdir
-	$(AM_V_GEN)grep '^@d eTeX_version_string==' $(srcdir)/pdftexdir/pdftex.web \
-	  | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@
+$(srcdir)/pdftexdir/etex_version.h: pdftexdir/pdftex.web
+@MAINTAINER_MODE_TRUE@	$(AM_V_GEN)grep '^@d eTeX_version_string==' $(srcdir)/pdftexdir/pdftex.web \
+@MAINTAINER_MODE_TRUE@	  | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@
 
 # Generate pdftex.ch
 pdftex.ch: tie$(EXEEXT) $(pdftex_ch_srcs)
@@ -11374,15 +11368,13 @@ xetex-tangle: otangle$(EXEEXT) xetexdir/xetex.web xetex.ch tangle-sh
 	@$(xe_tangle) xetex xetex
 
 # Extract etex version
-xetexdir/etex_version.h: xetexdir/xetex.web
-	$(AM_V_at)$(MKDIR_P) xetexdir
-	$(AM_V_GEN)grep '^@d eTeX_version_string==' $(srcdir)/xetexdir/xetex.web \
-	  | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@
-
-xetexdir/xetex_version.h: xetexdir/xetex.web
-	$(AM_V_at)$(MKDIR_P) xetexdir
-	$(AM_V_GEN)grep '^@d XeTeX_version_string==' $(srcdir)/xetexdir/xetex.web \
-	  | sed "s/^.*'-/#define XETEX_VERSION \"/;s/'.*$$/\"/" >$@
+$(srcdir)/xetexdir/etex_version.h: xetexdir/xetex.web
+@MAINTAINER_MODE_TRUE@	$(AM_V_GEN)grep '^@d eTeX_version_string==' $(srcdir)/xetexdir/xetex.web \
+@MAINTAINER_MODE_TRUE@	  | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@
+
+$(srcdir)/xetexdir/xetex_version.h: xetexdir/xetex.web
+@MAINTAINER_MODE_TRUE@	$(AM_V_GEN)grep '^@d XeTeX_version_string==' $(srcdir)/xetexdir/xetex.web \
+@MAINTAINER_MODE_TRUE@	  | sed "s/^.*'-/#define XETEX_VERSION \"/;s/'.*$$/\"/" >$@
 
 xetex.ch: tie$(EXEEXT) $(xetex_ch_srcs)
 	$(tie) -c xetex.ch $(xetex_ch_srcs)
diff --git a/Build/source/texk/web2c/eptexdir/ChangeLog b/Build/source/texk/web2c/eptexdir/ChangeLog
index 5771b64eda2..91bf86f73e1 100644
--- a/Build/source/texk/web2c/eptexdir/ChangeLog
+++ b/Build/source/texk/web2c/eptexdir/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* am/eptex.am: Better rule for eptex_version.h.
+
 2013-03-01  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* eptex.ech: e-TeX Version 2.6.
diff --git a/Build/source/texk/web2c/eptexdir/am/eptex.am b/Build/source/texk/web2c/eptexdir/am/eptex.am
index cc587e86d06..bf0757db3fd 100644
--- a/Build/source/texk/web2c/eptexdir/am/eptex.am
+++ b/Build/source/texk/web2c/eptexdir/am/eptex.am
@@ -46,10 +46,11 @@ eptex-tangle: tangle$(EXEEXT) eptex.web eptex.ch tangle-sh
 	@$(texmf_tangle) eptex eptex
 
 # Extract eptex version
-eptexdir/eptex_version.h: eptexdir/eptex.ech
-	$(AM_V_at)$(MKDIR_P) eptexdir
+$(srcdir)/eptexdir/eptex_version.h: eptexdir/eptex.ech
+if MAINTAINER_MODE
 	$(AM_V_GEN)grep '^@d epTeX_version_string==' $(srcdir)/eptexdir/eptex.ech \
 	  | sed "s/^.*'-/#define EPTEX_VERSION \"/;s/'.*$$/\"/" >$@
+endif MAINTAINER_MODE
 
 # Generate eptex.web
 eptex.web: tie$(EXEEXT) $(eptex_web_srcs)
diff --git a/Build/source/texk/web2c/etexdir/ChangeLog b/Build/source/texk/web2c/etexdir/ChangeLog
index 7b7a990e3ef..a45d812356d 100644
--- a/Build/source/texk/web2c/etexdir/ChangeLog
+++ b/Build/source/texk/web2c/etexdir/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* am/etex.am: Better rule for etex_version.h.
+
 2013-03-01  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* etex.ch, etex_version.h: Version 2.6.
diff --git a/Build/source/texk/web2c/etexdir/am/etex.am b/Build/source/texk/web2c/etexdir/am/etex.am
index 6b193a4b45b..7fb818b1854 100644
--- a/Build/source/texk/web2c/etexdir/am/etex.am
+++ b/Build/source/texk/web2c/etexdir/am/etex.am
@@ -39,10 +39,11 @@ etex-tangle: tangle$(EXEEXT) etex.web etex.ch tangle-sh
 	@$(texmf_tangle) etex etex
 
 # Extract etex version
-etexdir/etex_version.h: etexdir/etex.ch
-	$(AM_V_at)$(MKDIR_P) etexdir
+$(srcdir)/etexdir/etex_version.h: etexdir/etex.ch
+if MAINTAINER_MODE
 	$(AM_V_GEN)grep '^@d eTeX_version_string==' $(srcdir)/etexdir/etex.ch \
 	  | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@
+endif MAINTAINER_MODE
 
 # Generate etex.web
 etex.web: tie$(EXEEXT) $(etex_web_srcs)
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index f8a9c403756..bdacf399831 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* am/pdftex.am: Better rules for {pdf,e}tex_version.h.
+
 2013-02-28  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* pdftex.web: Adapt to e-TeX 2.5.
diff --git a/Build/source/texk/web2c/pdftexdir/am/pdftex.am b/Build/source/texk/web2c/pdftexdir/am/pdftex.am
index 267d3f905db..b2359cf5f10 100644
--- a/Build/source/texk/web2c/pdftexdir/am/pdftex.am
+++ b/Build/source/texk/web2c/pdftexdir/am/pdftex.am
@@ -52,16 +52,18 @@ pdftex-pool.c: pdftex.pool pdftexd.h $(makecpool_stamp)
 	$(makecpool) pdftex >$@ || rm -f $@
 
 # Extract pdftex version
-pdftexdir/pdftex_version.h: pdftexdir/pdftex.web
-	$(AM_V_at)$(MKDIR_P) pdftexdir
+$(srcdir)/pdftexdir/pdftex_version.h: pdftexdir/pdftex.web
+if MAINTAINER_MODE
 	$(AM_V_GEN)grep '^@d pdftex_version_string==' $(srcdir)/pdftexdir/pdftex.web \
 	  | sed "s/^.*'-/#define PDFTEX_VERSION \"/;s/'.*$$/\"/" >$@
+endif MAINTAINER_MODE
 
 # Extract etex version
-pdftexdir/etex_version.h: pdftexdir/pdftex.web
-	$(AM_V_at)$(MKDIR_P) pdftexdir
+$(srcdir)/pdftexdir/etex_version.h: pdftexdir/pdftex.web
+if MAINTAINER_MODE
 	$(AM_V_GEN)grep '^@d eTeX_version_string==' $(srcdir)/pdftexdir/pdftex.web \
 	  | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@
+endif MAINTAINER_MODE
 
 # Generate pdftex.ch
 pdftex.ch: tie$(EXEEXT) $(pdftex_ch_srcs)
diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog
index 956e5dae181..aaa1c37fa54 100644
--- a/Build/source/texk/web2c/ptexdir/ChangeLog
+++ b/Build/source/texk/web2c/ptexdir/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* am/ptex.am: Better rule for ptex_version.h.
+
 2013-02-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Avoid spurious failures of parallel tests.
diff --git a/Build/source/texk/web2c/ptexdir/am/ptex.am b/Build/source/texk/web2c/ptexdir/am/ptex.am
index efb62833deb..265e07dec17 100644
--- a/Build/source/texk/web2c/ptexdir/am/ptex.am
+++ b/Build/source/texk/web2c/ptexdir/am/ptex.am
@@ -78,10 +78,11 @@ ptex-tangle: tangle$(EXEEXT) ptex.web ptex.ch tangle-sh
 	@$(texmf_tangle) ptex ptex
 
 # Extract ptex version
-ptexdir/ptex_version.h: ptexdir/ptex-base.ch
-	$(AM_V_at)$(MKDIR_P) ptexdir
+$(srcdir)/ptexdir/ptex_version.h: ptexdir/ptex-base.ch
+if MAINTAINER_MODE
 	$(AM_V_GEN)grep '^@d pTeX_version_string==' $(srcdir)/ptexdir/ptex-base.ch \
 	  | sed "s/^.*'-/#define PTEX_VERSION \"/;s/'.*$$/\"/" >$@
+endif MAINTAINER_MODE
 
 # Generate ptex.web
 ptex.web: tie$(EXEEXT) $(ptex_web_srcs)
diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog
index 4a48408a7aa..cdb54e86651 100644
--- a/Build/source/texk/web2c/uptexdir/ChangeLog
+++ b/Build/source/texk/web2c/uptexdir/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* am/uptex.am: Better rule for uptex_version.h.
+
 2013-02-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* am/uptex.am, upbibtex.test, updvitype.test, uppltotf.test,
diff --git a/Build/source/texk/web2c/uptexdir/am/uptex.am b/Build/source/texk/web2c/uptexdir/am/uptex.am
index e7b4de8b3cb..1304472e115 100644
--- a/Build/source/texk/web2c/uptexdir/am/uptex.am
+++ b/Build/source/texk/web2c/uptexdir/am/uptex.am
@@ -68,10 +68,11 @@ uptex-tangle: tangle$(EXEEXT) uptex.web uptex.ch tangle-sh
 	@$(texmf_tangle) uptex uptex
 
 # Extract uptex version
-uptexdir/uptex_version.h: uptexdir/uptex-m.ch
-	$(AM_V_at)$(MKDIR_P) uptexdir
+$(srcdir)/uptexdir/uptex_version.h: uptexdir/uptex-m.ch
+if MAINTAINER_MODE
 	$(AM_V_GEN)grep '^@d upTeX_version_string==' $(srcdir)/uptexdir/uptex-m.ch \
 	  | sed "s/^.*'-/#define UPTEX_VERSION \"/;s/'.*$$/\"/" >$@
+endif MAINTAINER_MODE
 
 # Generate uptex.web
 uptex.web: tie$(EXEEXT) $(uptex_web_srcs)
diff --git a/Build/source/texk/web2c/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog
index 390e27e5c3d..53fe4bd4cb3 100644
--- a/Build/source/texk/web2c/xetexdir/ChangeLog
+++ b/Build/source/texk/web2c/xetexdir/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* am/xetex.am: Better rules for {e,xe}tex_version.h.
+
 2013-02-28  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* xetex.web: Adapt to e-TeX 2.5.
diff --git a/Build/source/texk/web2c/xetexdir/am/xetex.am b/Build/source/texk/web2c/xetexdir/am/xetex.am
index 58c88b8117c..e3ecdd3ef26 100644
--- a/Build/source/texk/web2c/xetexdir/am/xetex.am
+++ b/Build/source/texk/web2c/xetexdir/am/xetex.am
@@ -81,16 +81,18 @@ xetex-tangle: otangle$(EXEEXT) xetexdir/xetex.web xetex.ch tangle-sh
 	@$(xe_tangle) xetex xetex
 
 # Extract etex version
-xetexdir/etex_version.h: xetexdir/xetex.web
-	$(AM_V_at)$(MKDIR_P) xetexdir
+$(srcdir)/xetexdir/etex_version.h: xetexdir/xetex.web
+if MAINTAINER_MODE
 	$(AM_V_GEN)grep '^@d eTeX_version_string==' $(srcdir)/xetexdir/xetex.web \
 	  | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@
+endif MAINTAINER_MODE
 
 ## Extract xetex version
-xetexdir/xetex_version.h: xetexdir/xetex.web
-	$(AM_V_at)$(MKDIR_P) xetexdir
+$(srcdir)/xetexdir/xetex_version.h: xetexdir/xetex.web
+if MAINTAINER_MODE
 	$(AM_V_GEN)grep '^@d XeTeX_version_string==' $(srcdir)/xetexdir/xetex.web \
 	  | sed "s/^.*'-/#define XETEX_VERSION \"/;s/'.*$$/\"/" >$@
+endif MAINTAINER_MODE
 
 ## Generate xetex.ch
 xetex.ch: tie$(EXEEXT) $(xetex_ch_srcs)