Magellan Linux

Contents of /trunk/slim/patches/slim-1.3.6-only-build-slimlock-with-pam.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 2356 - (show annotations) (download)
Thu Dec 19 09:02:44 2013 UTC (10 years, 10 months ago) by niro
File size: 898 byte(s)
-fixed a typo
1 diff -Naur slim-1.3.6/CMakeLists.txt slim-1.3.6-no-pam/CMakeLists.txt
2 --- slim-1.3.6/CMakeLists.txt 2013-10-01 22:38:05.000000000 +0000
3 +++ slim-1.3.6-no-pam/CMakeLists.txt 2013-12-19 12:00:34.033000000 +0000
4 @@ -221,7 +221,11 @@
5 ####### install
6 # slim
7 install(TARGETS slim RUNTIME DESTINATION bin)
8 -install(TARGETS slimlock RUNTIME DESTINATION bin)
9 +if (BUILD_SLIMLOCK)
10 + install(TARGETS slimlock RUNTIME DESTINATION bin)
11 +else()
12 + install(TARGETS RUNTIME DESTINATION bin)
13 +endif(BUILD_SLIMLOCK)
14
15 if (BUILD_SHARED_LIBS)
16 set_target_properties(libslim PROPERTIES
17 @@ -236,7 +240,9 @@
18
19 # man file
20 install(FILES slim.1 DESTINATION ${MANDIR}/man1/)
21 -install(FILES slimlock.1 DESTINATION ${MANDIR}/man1/)
22 +if (BUILD_SLIMLOCK)
23 + install(FILES slimlock.1 DESTINATION ${MANDIR}/man1/)
24 +endif(BUILD_SLIMLOCK)
25 # configure
26 install(FILES slim.conf DESTINATION ${SYSCONFDIR})
27 # systemd service file