Changeset 5a57386


Ignore:
Timestamp:
Apr 24, 2010, 5:38:25 PM (14 years ago)
Author:
Nelson Elhage <nelhage@mit.edu>
Branches:
master, release-1.10, release-1.6, release-1.7, release-1.8, release-1.9
Children:
858c9c4
Parents:
9d2a105
Message:
Define DATADIR and BINDIR in the Makefile, not config.h

This is the recommended way to do it, and deals with the fact that
DATADIR and BINDIR themselves expand to variable references.
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • Makefile.am

    r7d03c8d r5a57386  
    3838CPPFLAGS = -I$(top_srcdir)/ \
    3939           -I$(top_srcdir)/libfaim/ \
     40           -DDATADIR='"$(datadir)"' \
     41           -DBINDIR='"$(bindir)"' \
    4042           $(GIT_FLAGS)
    4143

  • configure.ac

    r9d2a105 r5a57386  
    118118fi
    119119
    120 AC_DEFINE_UNQUOTED([DATADIR],["${prefix}/share/${PACKAGE}"],
    121                    [Package data directory])
    122 AC_DEFINE_UNQUOTED([BINDIR],["${prefix}/bin"],
    123                    [Binary directory])
    124 
    125120dnl Checks for typedefs, structures, and compiler characteristics.
    126121
Note: See TracChangeset for help on using the changeset viewer.