View Issue Details
ID | Project | Category | View Status | Date Submitted | Last Update |
---|---|---|---|---|---|
0004731 | Scribus | Build System | public | 2006-12-05 12:01 | 2006-12-10 00:36 |
Reporter | deejay1 | Assigned To | cbradney | ||
Priority | none | Severity | feature | Reproducibility | always |
Status | closed | Resolution | fixed | ||
Platform | i686 | OS | Linux 2.6.x | OS Version | PLD Linux |
Product Version | 1.3.3.6 | ||||
Fixed in Version | 1.3.3.7cvs | ||||
Summary | 0004731: Scribus installs it's documentation in $PREFIX/share/doc/scribus/ by default | ||||
Description | The behaviour of make install has once again changed, which propably breaks some build systems. Attached patch restores previous behaviour if versioning isn't used. | ||||
Tags | No tags attached. | ||||
Patch | |||||
2006-12-05 12:11
|
cmake.patch (723 bytes)
--- CMakeLists.txt 2006-12-05 12:19:44.000000000 +0100 +++ CMakeLists.txt-docdir 2006-12-05 13:09:08.000000000 +0100 @@ -61,7 +61,11 @@ SET(MANDIR "man/") SET(SHAREDIR "share/${MAIN_DIR_NAME}${TAG_VERSION}/") ADD_DEFINITIONS("-DSHAREDIR=\\\"${CMAKE_INSTALL_PREFIX}/${SHAREDIR}\\\"") -SET(DOCDIR "share/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") +IF(TAG_VERSION) + SET(DOCDIR "share/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") +ELSE(TAG_VERSION) + SET(DOCDIR "share/doc/${MAIN_DIR_NAME}-${VERSION}/") +ENDIF (TAG_VERSION) ADD_DEFINITIONS("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"") SET(ICONDIR "share/${MAIN_DIR_NAME}${TAG_VERSION}/icons/") ADD_DEFINITIONS("-DICONDIR=\\\"${CMAKE_INSTALL_PREFIX}/${ICONDIR}\\\"") |
|
Hmm, seems like mandir is also wrong. According to FHS it should be /usr/share/man ( http://www.pathname.com/fhs/pub/fhs-2.3.html#USRSHAREMANMANUALPAGES ) so in CMakeLists.txt change SET(MANDIR "man/") to SET(MANDIR "share/man/") |
Date Modified | Username | Field | Change |
---|---|---|---|
2006-12-05 12:01 | deejay1 | New Issue | |
2006-12-05 12:01 | deejay1 | File Added: cmake.patch | |
2006-12-05 12:03 |
|
Status | new => assigned |
2006-12-05 12:03 |
|
Assigned To | => cbradney |
2006-12-05 12:09 | deejay1 | File Deleted: cmake.patch | |
2006-12-05 12:11 | deejay1 | File Added: cmake.patch | |
2006-12-05 12:35 | deejay1 | Note Added: 0013772 | |
2006-12-05 20:15 | cbradney | Status | assigned => resolved |
2006-12-05 20:15 | cbradney | Fixed in Version | => 1.3.3.7cvs |
2006-12-05 20:15 | cbradney | Resolution | open => fixed |
2006-12-10 00:36 | cbradney | Status | resolved => closed |