Changeset 3808 for ThirdParty/Glpk


Ignore:
Timestamp:
Jan 26, 2018 7:27:02 PM (19 months ago)
Author:
lou
Message:

Conform to recommended Gnu directory structure.

Location:
ThirdParty/Glpk/branches/autotools-update
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Glpk/branches/autotools-update/Makefile.in

    r3804 r3808  
    2929########################################################################
    3030
    31 # COIN overrides the default definitions of datadir and docdir.
     31# Set these up to provide some uniformity in naming while also conforming
     32# to Gnu directory standards. For reasons known only to the autoconf
     33# developers, autoconf leaves datadir = $(datarootdir) but forces docdir
     34# to $(datarootdir)/doc/$(PACKAGE_TARNAME).
    3235
    3336VPATH = @srcdir@
     
    8790am__make_dryrun = (target_option=n; $(am__make_running_with_option))
    8891am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
    89 pkgincludedir = $(includedir)/@PACKAGE@
    9092pkglibdir = $(libdir)/@PACKAGE@
    9193pkglibexecdir = $(libexecdir)/@PACKAGE@
     
    203205CSCOPE = cscope
    204206DIST_SUBDIRS = $(SUBDIRS)
    205 pkgdatadir = $(datadir)/$(PACKAGE_NAME)
     207pkgdatadir = $(datadir)/$(PACKAGE_TARNAME)
     208pkgincludedir = $(includedir)/coin-or
    206209ACLOCAL = @ACLOCAL@
    207210AMTAR = @AMTAR@
     
    289292build_vendor = @build_vendor@
    290293builddir = @builddir@
    291 datadir = @datarootdir@/coin/data
     294datadir = @datadir@
    292295datarootdir = @datarootdir@
    293 docdir = @datarootdir@/coin/doc
     296docdir = @docdir@
    294297dvidir = @dvidir@
    295298exec_prefix = @exec_prefix@
     
    337340CLEANFILES =
    338341DISTCLEANFILES =
    339 pkgdocdir = $(docdir)/$(PACKAGE_NAME)
     342pkgdocdir = $(docdir)
     343
     344# doxydocdir is the top-level directory for doxygen documentation. It holds
     345# the tag file and possibly the PDF or Postscript version. doxyhtmldir is
     346# typically a subdirectory containing all the files doxygen creates for
     347# html documentation.
    340348doxydocdir = $(pkgdocdir)/doxydoc
    341 doxyhtmldir = $(doxydocdir)
     349doxyhtmldir = $(doxydocdir)/html
    342350
    343351########################################################################
     
    350358# Needless to say, it's important that doxydocdir_nosub not be a target for
    351359# autoconf substitution.
    352 DOXYTAG_EDIT = sed -e 's|@docdir_nosub@|$(docdir)|g'
     360DOXYTAG_EDIT = sed -e 's|@baredocdir_nosub@|$(datarootdir)/doc|g'
    353361all: config_glpk.h
    354362        $(MAKE) $(AM_MAKEFLAGS) all-recursive
  • ThirdParty/Glpk/branches/autotools-update/coinglpk.pc.in

    r3804 r3808  
    22exec_prefix=@exec_prefix@
    33libdir=@libdir@
    4 includedir=@includedir@/coin/ThirdParty
     4includedir=@includedir@/coin-or/ThirdParty
    55
    66Name: Glpk
  • ThirdParty/Glpk/branches/autotools-update/configure

    r3804 r3808  
    29112911
    29122912# Initialize automake
    2913 # - don't define PACKAGE or VERSION
     2913# - don't AC_DEFINE PACKAGE or VERSION (but there're still defined as shell
     2914#   variables in configure, and as make variables).
    29142915# - disable dist target
    29152916# - enable all automake warnings
     
    30523053# glpk's install will put glpk.h in the proper place.
    30533054
    3054 ac_configure_args="$ac_configure_args --includedir=\\\${prefix}/include/coin/ThirdParty"
     3055ac_configure_args="$ac_configure_args --includedir=\\\${prefix}/include/coin-or/ThirdParty"
    30553056
    30563057#############################################################################
  • ThirdParty/Glpk/branches/autotools-update/configure.ac

    r3804 r3808  
    3131# glpk's install will put glpk.h in the proper place.
    3232
    33 ac_configure_args="$ac_configure_args --includedir=\\\${prefix}/include/coin/ThirdParty"
     33ac_configure_args="$ac_configure_args --includedir=\\\${prefix}/include/coin-or/ThirdParty"
    3434
    3535#############################################################################
Note: See TracChangeset for help on using the changeset viewer.