Changeset 551 for beatfish/trunk

Show
Ignore:
Timestamp:
03/21/08 05:45:32 (10 months ago)
Author:
conrad
Message:

update configure.ac to fix detection of PACKAGE_DATA_DIR

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • beatfish/trunk/config.h.in

    r331 r551  
    122122#undef PACKAGE_BUGREPORT 
    123123 
    124 /* Set the data dir for MetaDrums */ 
     124/* Set the data dir for Beatfish */ 
    125125#undef PACKAGE_DATA_DIR 
    126126 
    …… 
    139139/* If using the C implementation of alloca, define if you know the 
    140140   direction of stack growth for your system; otherwise it will be 
    141    automatically deduced at run-time. 
     141   automatically deduced at runtime. 
    142142        STACK_DIRECTION > 0 => grows toward higher addresses 
    143143        STACK_DIRECTION < 0 => grows toward lower addresses 

  • beatfish/trunk/configure.ac

    r346 r551  
    106106 
    107107dnl Set PACKAGE_DATA_DIR in config.h. 
    108 if test "x${datadir}" = 'x${prefix}/share'; then 
    109   if test "x${prefix}" = "xNONE"; then 
    110     AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, 
    111       "${ac_default_prefix}/share/${PACKAGE}", 
    112       [Set the data dir for MetaDrums]) 
    113   else 
    114     AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", 
    115       [Set the data dir for MetaDrums]) 
    116   fi 
     108PACKAGE_DATA_DIR="${datadir}" 
     109if test "x${prefix}" = "xNONE"; then 
     110  PACKAGE_DATA_DIR="${ac_default_prefix}/share/${PACKAGE}" 
    117111else 
    118   AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}", 
    119     [Set the data dir for MetaDrums]) 
     112  PACKAGE_DATA_DIR="${prefix}/share/${PACKAGE}" 
    120113fi 
    121  
     114AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${PACKAGE_DATA_DIR}", 
     115  [Set the data dir for Beatfish]) 
    122116 
    123117AC_OUTPUT([