Changeset 517

Show
Ignore:
Timestamp:
11/09/07 17:37:50 (1 year ago)
Author:
kickback
Message:

sweep: fix PACKAGE_DATA_DIR definition to work with recent autoconf versions. this fixes the about image. see here: http://www.gnu.org/software/automake/manual/autoconf/Defining-Directories.html#Defining-Directories for background

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • sweep/trunk/configure.ac

    r504 r517  
    371371  AC_DEFINE_UNQUOTED([PACKAGE_LOCALE_DIR], "${ac_default_prefix}/${DATADIRNAME}/locale", [Define the PACKAGE_LOCALE_DIR.]) 
    372372else 
    373   AC_DEFINE_UNQUOTED([PACKAGE_LOCALE_DIR], "${prefix}/${DATADIRNAME}/locale") 
    374 fi 
    375  
    376 dnl Set PACKAGE_DATA_DIR in config.h. 
    377 if test "x${datadir}" = 'x${prefix}/share'; then 
    378   if test "x${prefix}" = xNONE; then 
    379     AC_DEFINE_UNQUOTED([PACKAGE_DATA_DIR], "${ac_default_prefix}/share/${PACKAGE}", [Define the PACKAGE_DATA_DIR.]) 
    380   else 
    381     AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}") 
    382   fi 
    383 else 
    384   AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}") 
    385 fi 
     373  AC_DEFINE_UNQUOTED([PACKAGE_LOCALE_DIR], "${prefix}/${DATADIRN     datarootdir = @datarootdir@AME}/locale") 
     374fi 
     375 
     376 if test "x${datadir}" = 'x${prefix}/share'; then 
     377   if test "x${prefix}" = xNONE; then 
     378     PACKAGE_DATA_DIR='"${ac_default_prefix}/share/${PACKAGE}"' 
     379   else 
     380     PACKAGE_DATA_DIR='"${prefix}/share/${PACKAGE}"' 
     381   fi 
     382 else 
     383   PACKAGE_DATA_DIR='"${datadir}/${PACKAGE}"' 
     384 fi 
     385AC_SUBST(PACKAGE_DATA_DIR) 
    386386 
    387387dnl Set PACKAGE_PLUGIN_DIR in Makefiles and config.h. 

  • sweep/trunk/src/Makefile.am

    r392 r517  
    7979 
    8080sweep_LDFLAGS = @EXPORT_DYNAMIC_FLAGS@ 
     81 
     82sweep_CFLAGS = -DPACKAGE_DATA_DIR='@PACKAGE_DATA_DIR@'