From b31e2d59bdfcc3be46f3ec87de4bcabc32747133 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Fri, 14 Aug 2009 13:08:59 +0100 Subject: [PATCH] [build] Remove last user of CLUTTER_MAJORMINOR We should always use CLUTTER_API_VERSION instead. --- doc/manual/Makefile.am | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/manual/Makefile.am b/doc/manual/Makefile.am index be30d7aaa..f69bc5af5 100644 --- a/doc/manual/Makefile.am +++ b/doc/manual/Makefile.am @@ -1,4 +1,4 @@ -DOCDIR = $(DESTDIR)/$(datadir)/doc/@PACKAGE@-@CLUTTER_MAJORMINOR@ +DOCDIR = $(DESTDIR)/$(datadir)/doc/@PACKAGE@-@CLUTTER_API_VERSION@ HTML_FILES = html/*.html IMAGE_FILES = images/*.png EXTRA_DIST = clutter-manual.xml.in manual.xsl style.css $(srcdir)/$(IMAGE_FILES) @@ -7,12 +7,12 @@ CLEANFILES = pdf-build.stamp txt-build.stamp htmldoc-build.stamp clutter-manual. pdf-build.stamp: clutter-manual.xml SP_ENCODING=XML SP_CHARSET_FIXED=YES \ $(JW) -b pdf $(srcdir)/clutter-manual.xml && \ - mv $(srcdir)/clutter-manual.pdf clutter-manual-@CLUTTER_MAJORMINOR@.pdf && \ + mv $(srcdir)/clutter-manual.pdf clutter-manual-@CLUTTER_API_VERSION@.pdf && \ touch pdf-build.stamp txt-build.stamp: clutter-manual.xml $(XMLTO) txt $(srcdir)/clutter-manual.xml && \ - mv $(srcdir)/clutter-manual.txt clutter-manual-@CLUTTER_MAJORMINOR@.txt && \ + mv $(srcdir)/clutter-manual.txt clutter-manual-@CLUTTER_API_VERSION@.txt && \ touch txt-build.stamp htmldoc-build.stamp: clutter-manual.xml @@ -57,8 +57,8 @@ install-data-local: fi \ done; \ $(INSTALL_DATA) $(srcdir)/style.css $(DOCDIR)/html/style.css; \ - $(INSTALL_DATA) $(srcdir)/clutter-manual-@CLUTTER_MAJORMINOR@.txt $(DOCDIR)/clutter-manual-@CLUTTER_MAJORMINOR@.txt; \ - $(INSTALL_DATA) $(srcdir)/clutter-manual-@CLUTTER_MAJORMINOR@.pdf $(DOCDIR)/clutter-manual-@CLUTTER_MAJORMINOR@.pdf; \ + $(INSTALL_DATA) $(srcdir)/clutter-manual-@CLUTTER_API_VERSION@.txt $(DOCDIR)/clutter-manual-@CLUTTER_API_VERSION@.txt; \ + $(INSTALL_DATA) $(srcdir)/clutter-manual-@CLUTTER_API_VERSION@.pdf $(DOCDIR)/clutter-manual-@CLUTTER_API_VERSION@.pdf; \ fi .PHONY : doc