Changeset 5883

Show
Ignore:
Timestamp:
02/23/04 18:19:51 (5 years ago)
Author:
warmerda
Message:

INST_INCLUDE, INST_DATA, and INST_MAN now resettable by configure switch

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/GDALmake.opt.in

    r5863 r5883  
    4848exec_prefix     =       @exec_prefix@ 
    4949INST_PREFIX     =       @exec_prefix@ 
    50 INST_INCLUDE    =       @exec_prefix@/include 
    51 INST_DATA       =       @exec_prefix@/share/gdal 
     50INST_INCLUDE    =       @includedir@ 
     51INST_DATA       =       @datadir@ 
    5252INST_LIB        =       @libdir@ 
    5353INST_BIN        =       @bindir@ 
    5454INST_PYMOD      =       @pymoddir@ 
    5555INST_DOCS       =       @exec_prefix@/doc 
    56 INST_MAN        =       @exec_prefix@/man 
     56INST_MAN        =       @mandir@ 
    5757 
    5858# 

  • trunk/configure.in

    r5881 r5883  
    12351235 
    12361236AC_SUBST(EXE_EXT,$EXE_EXT) 
     1237 
     1238dnl --------------------------------------------------------------------------- 
     1239dnl If datadir is set to @prefix@/share, the modify it to be  
     1240dnl @prefix@/share/gdal.  I wish we could default this. 
     1241dnl --------------------------------------------------------------------------- 
     1242if test "$datadir" = '${prefix}/share' ; then 
     1243  datadir='${prefix}/share/gdal' 
     1244fi 
    12371245 
    12381246dnl ---------------------------------------------------------------------------