Remove version number from documentation filenames

gregorio-project · May 26, 2016 · 9fdb002 · 9fdb002
1 parent 6657aea
commit 9fdb002
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 16 deletions.
diff --git a/debian/gregoriotex.docs b/debian/gregoriotex.docs
@@ -1,2 +1,3 @@
 fonts/README.md
-doc/GregorioRef-*.pdf
+doc/GregorioRef.pdf
+doc/GregorioNabcRef.pdf
diff --git a/doc/Makefile.am b/doc/Makefile.am
@@ -26,34 +26,34 @@ NABCSRCFILES = GregorioNabcRef.tex veni.gabc
 # I know these rules look wrong, but they must not depend on anything that
 # gets generated or make distcheck will fail.
 
-GregorioRef-@FILENAME_VERSION@.pdf: $(SRCFILES)
+GregorioRef.pdf: $(SRCFILES)
 	$(MAKE) $(AM_MAKEFLAGS) -C ../src gregorio
 	../src/gregorio -o factus.gtex $(<D)/factus.gabc
 	TEXINPUTS=$(<D):$(<D)/../tex: LUAINPUTS=$(<D):$(<D)/../tex: \
 		 TTFONTS=$(<D)/../fonts: PATH=../src:${PATH} latexmk -recorder -pdf \
 		 -pdflatex='lualatex --shell-escape %O %S' \
-		 -jobname=GregorioRef-@FILENAME_VERSION@ $<
+		 -jobname=GregorioRef $<
 
-GregorioNabcRef-@FILENAME_VERSION@.pdf: $(NABCSRCFILES)
+GregorioNabcRef.pdf: $(NABCSRCFILES)
 	$(MAKE) $(AM_MAKEFLAGS) -C ../src gregorio
 	../src/gregorio -o veni.gtex $(<D)/veni.gabc
 	TEXINPUTS=$(<D):$(<D)/../tex: LUAINPUTS=$(<D):$(<D)/../tex: \
 		 TTFONTS=$(<D)/../fonts: PATH=../src:${PATH} latexmk -recorder -pdf \
 		 -pdflatex='lualatex --shell-escape %O %S' \
-		 -jobname=GregorioNabcRef-@FILENAME_VERSION@ $<
+		 -jobname=GregorioNabcRef $<
 
-doc: GregorioRef-$(FILENAME_VERSION).pdf GregorioNabcRef-$(FILENAME_VERSION).pdf
+doc: GregorioRef.pdf GregorioNabcRef.pdf
 
 pdf-local: doc
 
 distclean-local:
-	latexmk -quiet -c -f -jobname=GregorioRef-@FILENAME_VERSION@ GregorioRef.tex
-	latexmk -quiet -c -f -jobname=GregorioNabcRef-@FILENAME_VERSION@ GregorioNabcRef.tex
+	latexmk -quiet -c -f -jobname=GregorioRef GregorioRef.tex
+	latexmk -quiet -c -f -jobname=GregorioNabcRef GregorioNabcRef.tex
 	rm -rf _minted* *.gtex *.aux *.gaux
 
 EXTRA_DIST = $(SRCFILES) $(NABCSRCFILES) \
-	     GregorioRef-@FILENAME_VERSION@.pdf \
-	     GregorioNabcRef-@FILENAME_VERSION@.pdf
+	     GregorioRef.pdf \
+	     GregorioNabcRef.pdf
 
 maintainer-clean-local:
 	rm -rf GregorioRef*.pdf

diff --git a/install-gtex.sh b/install-gtex.sh
@@ -68,7 +68,7 @@ TTFFILES=(gregorio.ttf greciliae.ttf granapadano.ttf gregorio-op.ttf
           gresgmodern.ttf)
 DOCFILES=(doc/Appendix*.tex doc/Command*.tex doc/Gabc.tex
           doc/*Ref.tex doc/*Ref.lua doc/*.gabc
-          doc/Gregorio*Ref-$FILEVERSION.pdf)
+          doc/Gregorio*Ref.pdf)
 EXAMPLEFILES=(examples/FactusEst.gabc examples/PopulusSion.gabc
               examples/main-lualatex.tex examples/debugging.tex)
 FONTSRCFILES=(gregorio-base.sfd granapadano-base.sfd greciliae-base.sfd

diff --git a/src/gregorio-utils.c b/src/gregorio-utils.c
@@ -210,7 +210,7 @@ Formats:\n\
   dump      plain text dump (for debugging purpose)\n\
 \n\
 See <" PACKAGE_URL "> for general documentation,\n\
-GregorioRef-" FILENAME_VERSION ".pdf and GregorioNabcRef-" FILENAME_VERSION ".pdf for full documentation.\
+GregorioRef.pdf and GregorioNabcRef.pdf for full documentation.\
 \n"));
 }
 

diff --git a/windows/gregorio.iss b/windows/gregorio.iss
@@ -57,10 +57,8 @@ Source: "../CHANGELOG.md"; DestDir: "{app}";
 Source: "../README.md"; DestDir: "{app}";
 Source: "../CONTRIBUTORS.md"; DestDir: "{app}";
 Source: "../UPGRADE.md"; DestDir: "{app}";
-; PARSE_VERSION_FILE_NEXTLINE
-Source: "../doc/Gregorio*Ref-4_1_3.pdf"; DestDir: "{app}";
-; PARSE_VERSION_FILE_NEXTLINE
-Source: "../doc/Gregorio*Ref-4_1_3.pdf"; DestDir: "{app}\texmf\doc\luatex\gregoriotex";
+Source: "../doc/Gregorio*Ref.pdf"; DestDir: "{app}";
+Source: "../doc/Gregorio*Ref.pdf"; DestDir: "{app}\texmf\doc\luatex\gregoriotex";
 Source: "../COPYING.md"; DestDir: "{app}";
 Source: "../contrib/system-setup.bat"; DestDir: "{app}";
 Source: "../contrib/*"; DestDir: "{app}\contrib"; Excludes: "Makefile*,TeXShop\*,*.command";