--- CMakeLists.txt.orig	2010-03-25 09:44:43.000000000 -0300
+++ CMakeLists.txt	2010-03-25 09:47:21.000000000 -0300
@@ -116,7 +116,7 @@
 ENDIF (WANT_VERSIONING AND NOT CACHED_VERSIONING)
 
 #MAN
-SET(MANDIR "share/man/")
+SET(MANDIR "man/")
 SET(SHAREDIR "share/${MAIN_DIR_NAME}${TAG_VERSION}/")
 ADD_DEFINITIONS("-DSHAREDIR=\\\"${CMAKE_INSTALL_PREFIX}/${SHAREDIR}\\\"")
 #SHARE
@@ -169,7 +169,7 @@
 ENDIF(ARCH64BIT AND NOT LIB_SUFFIX)
 
 
-SET(LIB_DIR_NAME "lib${LIB_SUFFIX}")
+SET(LIB_DIR_NAME "lib")
 SET(LIBDIR "${LIB_DIR_NAME}/${MAIN_DIR_NAME}${TAG_VERSION}/")
 ADD_DEFINITIONS("-DLIBDIR=\\\"${CMAKE_INSTALL_PREFIX}/${LIBDIR}\\\"")
 
@@ -518,4 +518,5 @@
 ## I'll make this prettier later - ignore any tarballs in the root
   SET(CPACK_SOURCE_IGNORE_FILES CMakeCache.txt scribus-1.3.3.14.tar.bz2 scribus-1.3.3.14.tar.Z scribus-1.3.3.14.tar.gz "~$" "\\\\.cvsignore$" "^${PROJECT_SOURCE_DIR}.*/CVS/" "^${PROJECT_SOURCE_DIR}/debian/" "^${PROJECT_SOURCE_DIR}/old/" "^${PROJECT_SOURCE_DIR}.*/CVSROOT/" "^${PROJECT_SOURCE_DIR}.*/autom4te.cache/")
   INCLUDE(CPack)
+  SET_TARGET_PROPERTIES(scribus PROPERTIES LINK_FLAGS -Wl,-E)
 ENDIF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")