diff options
| author | Karl Berry <karl@freefriends.org> | 2016-09-28 23:39:56 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2016-09-28 23:39:56 +0000 |
| commit | 0ccb1bafd7b350766c1c43cea86f22ca4beb40a4 (patch) | |
| tree | d2e899e8c61786afb00cc76e46b56e4fec59af7f | |
| parent | a617c2af51851dd3949230bda3c054f4d8a7ea1a (diff) | |
do not use FILENAME_VERSION, as with TL16
git-svn-id: svn://tug.org/texlive/trunk@42176 c570f23f-e606-0410-a88d-b1316a301751
| -rw-r--r-- | Build/source/texk/gregorio/ChangeLog | 6 | ||||
| -rw-r--r-- | Build/source/texk/gregorio/Makefile.am | 6 | ||||
| -rw-r--r-- | Build/source/texk/gregorio/configure.ac | 4 | ||||
| -rwxr-xr-x | Build/source/texk/gregorio/gregorio.test | 7 |
4 files changed, 15 insertions, 8 deletions
diff --git a/Build/source/texk/gregorio/ChangeLog b/Build/source/texk/gregorio/ChangeLog index e436cb828b6..9fb8198bd28 100644 --- a/Build/source/texk/gregorio/ChangeLog +++ b/Build/source/texk/gregorio/ChangeLog @@ -1,3 +1,9 @@ +2016-09-29 Karl Berry <karl@tug.org> + + * Makefile.am (bin_PROGRAMS): just "gregorio" (same as TL'16). + * configure.ac (FILENAME_VERSION): no need to define for TL. + * gregorio.test (gregorio): do not use $FILENAME_VERSION. + 2016-09-25 Akira Kakuto <kakuto@fuk.kindai.ac.jp> Import gregorio-4.2.0. diff --git a/Build/source/texk/gregorio/Makefile.am b/Build/source/texk/gregorio/Makefile.am index a58e56caea8..44e72320ede 100644 --- a/Build/source/texk/gregorio/Makefile.am +++ b/Build/source/texk/gregorio/Makefile.am @@ -1,6 +1,8 @@ +## $Id$ ## Makefile.am for the TeX Live subdirectory texk/gregorio/ ## -## Copyright (C) 2015 Peter Breitenlohner <tex-live@tug.org> +## Copyright 2016 Karl Berry <tex-live@tug.org> +## Copyright 2015 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## ## We want to re-distribute the whole original gregorio source tree. @@ -20,7 +22,7 @@ AM_CPPFLAGS = \ $(KPATHSEA_INCLUDES) -D_GNU_SOURCE -DUSE_KPSE AM_CFLAGS = $(WARNING_CFLAGS) -bin_PROGRAMS = gregorio-$(FILENAME_VERSION) +bin_PROGRAMS = gregorio gregorio_SOURCES = \ @GREGORIO_TREE@/src/characters.c \ diff --git a/Build/source/texk/gregorio/configure.ac b/Build/source/texk/gregorio/configure.ac index 7b95ac38e61..faf7a68017e 100644 --- a/Build/source/texk/gregorio/configure.ac +++ b/Build/source/texk/gregorio/configure.ac @@ -1,3 +1,4 @@ +dnl $Id$ dnl Process this file with autoconf to produce a configure script. dnl dnl Copyright 2016 Karl Berry <tex-live@tug.org> @@ -9,9 +10,6 @@ dnl with or without modifications, as long as this notice is preserved. dnl m4_include([version.ac])[] dnl define gregorio_version AC_INIT([Gregorio (TeX Live)], gregorio_version, [tex-k@tug.org], [gregorio--tex-live-], [http://gregorio-project.github.io/]) -FILENAME_VERSION="4_2_0" -AC_SUBST(FILENAME_VERSION) -AC_DEFINE_UNQUOTED(FILENAME_VERSION, "$FILENAME_VERSION", [version suitable for file names]) AC_PREREQ([2.65]) AC_CONFIG_SRCDIR([gregorio-src/src/gregorio-utils.c]) AC_CONFIG_AUX_DIR([../../build-aux]) diff --git a/Build/source/texk/gregorio/gregorio.test b/Build/source/texk/gregorio/gregorio.test index 494f81668be..f8daa762d22 100755 --- a/Build/source/texk/gregorio/gregorio.test +++ b/Build/source/texk/gregorio/gregorio.test @@ -1,6 +1,7 @@ #! /bin/sh - -# Copyright (C) 2015 Peter Breitenlohner <tex-live@tug.org> +# $Id$ +# Copyright 2016 Karl Berry <tex-live@tug.org> +# Copyright 2015 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. TEXMFCNF=$srcdir/../kpathsea @@ -9,7 +10,7 @@ export TEXMFCNF DOCSRC=$srcdir/$GREGORIO_TREE/doc -gregorio=gregorio-$FILENAME_VERSION +gregorio=gregorio failed= |