--- CMakeLists.txt.orig	2016-07-20 16:53:48 UTC
+++ CMakeLists.txt
@@ -50,23 +50,25 @@ add_subdirectory(doc)
 add_subdirectory(src)
 
 IF(NOT DEFINED DOC_PATH)
-    set(DOC_PATH "share/doc/${CPACK_PACKAGE_NAME}-${VERSION}")
+    set(DOC_PATH "share/doc/${CPACK_PACKAGE_NAME}")
 ENDIF(NOT DEFINED DOC_PATH)
-set(DOC_FILES extras/convert.lua data/conky_no_x11.conf data/conky.conf)
+
+IF(NOT DEFINED SAMPLE_PATH)
+    set(SAMPLE_PATH "share/examples/${CPACK_PACKAGE_NAME}")
+ENDIF(NOT DEFINED SAMPLE_PATH)
+set(SAMPLE_FILES extras/convert.lua data/conky_no_x11.conf data/conky.conf)
 
 set(HTML_PATH "${DOC_PATH}/html")
 set(HTML_FILES doc/config_settings.html doc/docs.html doc/lua.html doc/variables.html)
 
-set(MAN_PATH "share/man/man1")
+set(MAN_PATH "man/man1")
 set(MAN_FILES doc/conky.1)
 
-install(FILES ${DOC_FILES}
-	DESTINATION ${DOC_PATH})
+install(FILES ${SAMPLE_FILES}
+	DESTINATION ${SAMPLE_PATH})
 
-if(MAINTAINER_MODE)
-	install(FILES ${HTML_FILES}
-		DESTINATION ${HTML_PATH})
+install(FILES ${HTML_FILES}
+	DESTINATION ${HTML_PATH})
 
-	install(FILES ${MAN_FILES}
-		DESTINATION ${MAN_PATH})
-endif(MAINTAINER_MODE)
+install(FILES ${MAN_FILES}
+	DESTINATION ${MAN_PATH})
