View Issue Details

IDProjectCategoryView StatusLast Update
0004731ScribusBuild Systempublic2006-12-10 00:36
Reporterdeejay1 Assigned Tocbradney  
PrioritynoneSeverityfeatureReproducibilityalways
Status closedResolutionfixed 
Platformi686OSLinux 2.6.xOS VersionPLD Linux
Product Version1.3.3.6 
Fixed in Version1.3.3.7cvs 
Summary0004731: Scribus installs it's documentation in $PREFIX/share/doc/scribus/ by default
DescriptionThe behaviour of make install has once again changed, which propably breaks some build systems. Attached patch restores previous behaviour if versioning isn't used.
TagsNo tags attached.
Patch

Activities

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}\\\"")
cmake.patch (723 bytes)   

deejay1

2006-12-05 12:35

developer   ~0013772

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/")

Issue History

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 plinnell Status new => assigned
2006-12-05 12:03 plinnell 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