Changeset 3850


Ignore:
Timestamp:
Oct 10, 2018 9:13:14 PM (14 months ago)
Author:
lou
Message:

Rationalise the handling of data directories. Add/update comments.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makemain.inc

    r3807 r3850  
    3838COIN_HAS_LATEX = @COIN_HAS_LATEX_TRUE@TRUE
    3939
    40 # Needless to say, it's important that doxydocdir_nosub not be a target for
     40# Needless to say, it's important that baredocdir_nosub not be a target for
    4141# autoconf substitution.
    4242
  • trunk/coin.m4

    r3848 r3850  
    492492
    493493# This macro sets up the public variables for lib, PROJ_LFLAGS_PUB,
    494 # PROJ_CFLAGS_PUB, PROJ_PCFILES_PUB, and PROJ_DATA. These variables correspond
    495 # to Libs, Cflags, Requires, and datadir in the .pc.in file for a project.
    496 # More generally, this macro is useful when a project builds libraries that
    497 # are used by other libraries during the project build. For example, Osi
    498 # builds OsiLib, which is used by OsiCommonTest and the various OsiXxxLib
    499 # interfaces to third-party solvers.
     494# PROJ_CFLAGS_PUB, PROJ_PCFILES_PUB, and PROJ_DATA_PUB. These variables
     495# correspond to Libs, Cflags, Requires, and datadir in the .pc.in file for
     496# a project.  More generally, this macro is useful when a project builds
     497# libraries that are used by other libraries during the project build. For
     498# example, Osi builds OsiLib, which is used by OsiCommonTest and the various
     499# OsiXxxLib interfaces to third-party solvers.
    500500
    501501# PROJ_PCFILES_PUB should be used rarely, if ever. We're exposing public
     
    504504
    505505# The datadir variable is a COIN extension in the .pc file. It defaults
    506 # to @datadir@/@PACKAGE_TARNAME@ in accordance with Gnu standards.
     506# to ${datarootdir}/PACKAGE_TARNAME in accordance with Gnu standards.
    507507
    508508AC_DEFUN([AC_COIN_INIT_LIBVARS],
     
    511511  AC_SUBST(m4_toupper($1_CFLAGS_PUB),["$3"])
    512512  AC_SUBST(m4_toupper($1_PCFILES_PUB),["$4"])
    513   AC_SUBST(m4_toupper($1_DATA),["$5"])
     513  AC_SUBST(m4_toupper($1_DATA_PUB),
     514           [m4_default([$5],[\${datarootdir}/$PACKAGE_TARNAME])])
    514515])
    515516 
     
    874875# client packages. These variables match Requires.private, Libs.private,
    875876# and Cflags.private, respectively, in a .pc file.
     877
     878# Data directory information is used differently. Typically what's wanted is
     879# individual variables specifying the data directory for each primitive. Hence
     880# the macro defines PRIM_DATA for the primitive.
    876881
    877882# The macro doesn't test that the specified values actually work. This is
     
    11991204# Cflags.private, respectively, in a .pc file.
    12001205
     1206# Data directory information is used differently. Typically what's wanted is
     1207# individual variables specifying the data directory for each primitive. Hence
     1208# the macro defines PRIM_DATA for the primitive.
     1209
    12011210# The macro doesn't test that the specified values actually work. This is
    12021211# deliberate.  There's no guarantee that user-specified libraries and/or
     
    14751484#                       doxygen documentation
    14761485
     1486# It's not immediately obvious, but the code in this macro, configure-time
     1487# substitions in doxygen.conf.in, and build-time edits of doxygen.conf in
     1488# Makemain.inc combine to hardwire the assumptions that a tag file is named
     1489# proj_doxy.tag, that PKG_TARNAME is coin-or-proj, and that the doxygen
     1490# documentation is in the GNU default location $(docdir)/$PKG_TARNAME. Have
     1491# a look over the complete machinery before you start changing things. The
     1492# point of the build-time edits is to allow the user to redefine docdir at
     1493# build time, as per GNU standards. Failure to use coin-or-proj as PKG_TARNAME
     1494# will surely break linking of documentation with tag files.
     1495
    14771496AC_DEFUN([AC_COIN_DOXYGEN],
    14781497[
     
    15011520fi
    15021521
    1503 # Generate a tag file name and a log file name
     1522# Generate a tag file name and a log file name.
    15041523
    15051524lc_pkg=`echo ${PACKAGE_NAME} | [tr [A-Z] [a-z]]`
     
    15091528AM_CONDITIONAL(COIN_HAS_LATEX, [test $coin_have_latex = yes])
    15101529
    1511 # Process the list of project names and massage each one into the name of a
    1512 # tag file. Further substitution for @doxydocdir@ will happen during make
    1513 # install.
     1530# Process the list of project names and massage each one into the name of
     1531# a tag file. The value of coin_doxy_tagfiles is substituted for TAGFILES
     1532# in doxygen.conf.in. Further substitution for @baredocdir_nosub@ will happen
     1533# as an edit during make install. See comments in Makemain.inc.
    15141534
    15151535coin_doxy_tagfiles=
Note: See TracChangeset for help on using the changeset viewer.