blob: 9cd9b4f471312159f92fa218f79f268e58f819fd (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
|
$NetBSD: patch-ai,v 1.4 2016/04/01 16:59:38 jperkin Exp $
--- CMakeLists.txt.orig 2010-01-27 22:07:14.000000000 +0000
+++ CMakeLists.txt
@@ -116,7 +116,7 @@ IF (WANT_VERSIONING AND NOT CACHED_VERSI
ENDIF (WANT_VERSIONING AND NOT CACHED_VERSIONING)
#MAN
-SET(MANDIR "share/man/")
+SET(MANDIR "${CMAKE_INSTALL_MANDIR}/")
SET(SHAREDIR "share/${MAIN_DIR_NAME}${TAG_VERSION}/")
ADD_DEFINITIONS("-DSHAREDIR=\\\"${CMAKE_INSTALL_PREFIX}/${SHAREDIR}\\\"")
#SHARE
@@ -144,30 +144,7 @@ ADD_DEFINITIONS("-DDESKTOPDIR=\\\"${CMAK
#LIB LOCATION - lib or lib64 normally
#LIB
-IF(WANT_LIB64)
- IF(NOT ARCH64BIT)
- MESSAGE(STATUS "WARNING: BUILDING 64 Bit build on non 64 bit architecture")
- ENDIF(NOT ARCH64BIT)
- SET(LIB_SUFFIX "64" CACHE TYPE STRING)
-ENDIF(WANT_LIB64)
-#OVERRIDE WANT_LIB64 with WANT_LIB32 if both exist
-IF(WANT_LIB32)
- IF(ARCH64BIT)
- MESSAGE(STATUS "WARNING: FORCING 32 Bit build on 64 bit architecture")
- ENDIF(ARCH64BIT)
- SET(LIB_SUFFIX "" CACHE TYPE STRING)
- SET(WANT_LIB64 "")
-ENDIF(WANT_LIB32)
-#Auto build 64 bit if user doesnt force 32 bit and we detect 64 bit
-IF(ARCH64BIT AND NOT LIB_SUFFIX)
- IF(NOT WANT_LIB32)
- IF(NOT WANT_LIB64)
- MESSAGE(STATUS "Autodetected 64 bit architecture, building for 64 Bit")
- SET(LIB_SUFFIX "64" CACHE TYPE STRING)
- ENDIF(NOT WANT_LIB64)
- ENDIF(NOT WANT_LIB32)
-ENDIF(ARCH64BIT AND NOT LIB_SUFFIX)
-
+SET(LIB_SUFFIX "" CACHE TYPE STRING)
SET(LIB_DIR_NAME "lib${LIB_SUFFIX}")
SET(LIBDIR "${LIB_DIR_NAME}/${MAIN_DIR_NAME}${TAG_VERSION}/")
@@ -497,8 +474,8 @@ DESTINATION ${MIMEDIR}
)
#KDE workaround until it starts supporting freedesktop spec
INSTALL(FILES
- vnd.scribus.desktop
- DESTINATION ${MIMELNKDIR}
+ vnd.scribus.desktop
+ DESTINATION ${DESKTOPDIR}
)
|
