Download as
Browse Code »

Commit dff1d0188803e86c6f1971a48affaadd6fddd75e

Authored by Perry Werneck
2 parents d1dcc329 90555a73
Exists in master and in 1 other branch develop

Merge branch 'stable' into develop

Showing 2 changed files with 5 additions and 5 deletions   Show diff stats
doxygen/doxyfile.in
  Diff comments   View file @dff1d01
@@ -52,7 +52,7 @@ PROJECT_LOGO = "@PACKAGE_NAME@.svg" @@ -52,7 +52,7 @@ PROJECT_LOGO = "@PACKAGE_NAME@.svg"
52 # If a relative path is entered, it will be relative to the location 52 # If a relative path is entered, it will be relative to the location
53 # where doxygen was started. If left blank the current directory will be used. 53 # where doxygen was started. If left blank the current directory will be used.
54 54
55 -OUTPUT_DIRECTORY = @BASEDIR@/doxygen 55 +OUTPUT_DIRECTORY = @BUILDDIR@/doxygen
56 56
57 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 57 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
58 # 4096 sub-directories (in 2 levels) under the output directory of each output 58 # 4096 sub-directories (in 2 levels) under the output directory of each output
@@ -140,7 +140,7 @@ FULL_PATH_NAMES = YES @@ -140,7 +140,7 @@ FULL_PATH_NAMES = YES
140 # relative paths, which will be relative from the directory where doxygen is 140 # relative paths, which will be relative from the directory where doxygen is
141 # started. 141 # started.
142 142
143 -STRIP_FROM_PATH = @BASEDIR@/src 143 +STRIP_FROM_PATH = @BUILDDIR@/src
144 144
145 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 145 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
146 # the path mentioned in the documentation of a class, which tells 146 # the path mentioned in the documentation of a class, which tells
@@ -648,7 +648,7 @@ WARN_FORMAT = "$file:$line: $text" @@ -648,7 +648,7 @@ WARN_FORMAT = "$file:$line: $text"
648 # and error messages should be written. If left blank the output is written 648 # and error messages should be written. If left blank the output is written
649 # to stderr. 649 # to stderr.
650 650
651 -WARN_LOGFILE = @BASEDIR@/doxygen/doxygen.log 651 +WARN_LOGFILE = @BUILDDIR@/doxygen/doxygen.log
652 652
653 #--------------------------------------------------------------------------- 653 #---------------------------------------------------------------------------
654 # configuration options related to the input files 654 # configuration options related to the input files
@@ -659,7 +659,7 @@ WARN_LOGFILE = @BASEDIR@/doxygen/doxygen.log @@ -659,7 +659,7 @@ WARN_LOGFILE = @BASEDIR@/doxygen/doxygen.log
659 # directories like "/usr/src/myproject". Separate the files or directories 659 # directories like "/usr/src/myproject". Separate the files or directories
660 # with spaces. 660 # with spaces.
661 661
662 -INPUT = @BASEDIR@/src 662 +INPUT = @BUILDDIR@/src
663 663
664 # This tag can be used to specify the character encoding of the source files 664 # This tag can be used to specify the character encoding of the source files
665 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 665 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
locale/Makefile.in
  Diff comments   View file @dff1d01
@@ -38,7 +38,7 @@ PACKAGE_VERSION=@PACKAGE_VERSION@ @@ -38,7 +38,7 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
38 PACKAGE_TARNAME=@PACKAGE_TARNAME@ 38 PACKAGE_TARNAME=@PACKAGE_TARNAME@
39 PRODUCT_NAME=@PRODUCT_NAME@ 39 PRODUCT_NAME=@PRODUCT_NAME@
40 40
41 -BASEDIR=@BASEDIR@ 41 +BASEDIR=@BUILDDIR@
42 BINDIR=$(BASEDIR)/.bin/locale 42 BINDIR=$(BASEDIR)/.bin/locale
43 43
44 MKDIR=@MKDIR_P@ 44 MKDIR=@MKDIR_P@