Skip to content

Commit

Permalink
Fixes issue where an absolute EXEC_PREFIX is treated wrong.
Browse files Browse the repository at this point in the history
  • Loading branch information
rocketman768 committed Oct 31, 2011
1 parent 969dbd5 commit 651039c
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
2 changes: 1 addition & 1 deletion configure
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ CMAKEOPTIONS="-DDO_RELEASE_BUILD=ON"
function printUsageAndExit {
echo -e "Usage\n" \
" Options:\n" \
" -m T Set mac arch (\"i386 ppc\" for universal binary)\n" \
" -m T Set mac arch (\"i386;ppc\" for universal binary)\n" \
" -p T Set prefix to T.\n" \
" -t Update translation files (*.ts).\n" \
" -v Verbose compilation.\n" \
Expand Down
13 changes: 11 additions & 2 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,17 @@ SET( FILES_TO_TRANSLATE
# "#define CONFIGDATADIR ${CONFIGDATADIR}$" in config.in will be replaced
# by the below corresponding value in ${CONFIGDATADIR} below when
# CONFIGURE_FILE() is called.
SET( CONFIGDATADIR "/${DATAPATH}/" )
SET( CONFIGDOCDIR "/${DOCPATH}/" )
IF( IS_ABSOLUTE ${DATAPATH} )
SET( CONFIGDATADIR "${DATAPATH}/" )
ELSE()
SET( CONFIGDATADIR "/${DATAPATH}/" )
ENDIF()

IF( IS_ABSOLUTE ${DOCPATH} )
SET( CONFIGDOCDIR "${DOCPATH}/" )
ELSE()
SET( CONFIGDOCDIR "/${DOCPATH}/" )
ENDIF()

# Tell cmake where the configure file is and where
# to put the output. All variables in config.in written as "${VAR}$
Expand Down

0 comments on commit 651039c

Please sign in to comment.