Rename SHARE_INSTALL_DIR to SHARE_INSTALL_PREFIX

That seems to be the correct (common) variable name. Also ensure
the folders will not be empty.

19 files changed, 52 insertions, 38 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index aec781aea..26e9a1e86 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -142,13 +142,27 @@ include(PrintableOptions)
 
 add_printable_variable(LIB_SUFFIX "Library directory suffix, usually defined to '64' for x86_64 systems" "")
 add_printable_variable_bare(CMAKE_INSTALL_PREFIX)
-add_printable_variable_path(BIN_INSTALL_DIR "Install directory for binary files, defaults to CMAKE_INSTALL_PREFIX/bin" "${CMAKE_INSTALL_PREFIX}/bin")
-add_printable_variable_path(INCLUDE_INSTALL_DIR "Install directory for header files, defaults to CMAKE_INSTALL_PREFIX/include" "${CMAKE_INSTALL_PREFIX}/include")
-add_printable_variable_path(LIB_INSTALL_DIR "Install directory for library files, defaults to CMAKE_INSTALL_PREFIX/lib{LIB_SUFFIX}" "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
-add_printable_variable_path(LIBEXEC_INSTALL_DIR "Install directory for library executable files, defaults to CMAKE_INSTALL_PREFIX/libexec" "${CMAKE_INSTALL_PREFIX}/libexec")
-add_printable_variable_path(SHARE_INSTALL_DIR "Install directory for shared files, defaults to CMAKE_INSTALL_PREFIX/share" "${CMAKE_INSTALL_PREFIX}/share")
-add_printable_variable_path(LOCALE_INSTALL_DIR "Install directory for locale files, defaults to SHARE_INSTALL_DIR/locale" "${SHARE_INSTALL_DIR}/locale")
-add_printable_variable_path(SYSCONF_INSTALL_DIR "Install directory for system configuration files, defaults to CMAKE_INSTALL_PREFIX/etc" "${CMAKE_INSTALL_PREFIX}/etc")
+add_printable_variable_path(BIN_INSTALL_DIR "Install directory for binary files, defaults to CMAKE_INSTALL_PREFIX/bin" "")
+add_printable_variable_path(INCLUDE_INSTALL_DIR "Install directory for header files, defaults to CMAKE_INSTALL_PREFIX/include" "")
+add_printable_variable_path(LIB_INSTALL_DIR "Install directory for library files, defaults to CMAKE_INSTALL_PREFIX/lib{LIB_SUFFIX}" "")
+add_printable_variable_path(LIBEXEC_INSTALL_DIR "Install directory for library executable files, defaults to CMAKE_INSTALL_PREFIX/libexec" "")
+add_printable_variable_path(SHARE_INSTALL_PREFIX "Install directory for shared files, defaults to CMAKE_INSTALL_PREFIX/share" "")
+add_printable_variable_path(LOCALE_INSTALL_DIR "Install directory for locale files, defaults to SHARE_INSTALL_PREFIX/locale" "")
+add_printable_variable_path(SYSCONF_INSTALL_DIR "Install directory for system configuration files, defaults to CMAKE_INSTALL_PREFIX/etc" "")
+
+macro(ensure_default_value _var _defvalue)
+	if(${_var} STREQUAL "")
+		set(${_var} ${_defvalue})
+	endif(${_var} STREQUAL "")
+endmacro(ensure_default_value)
+
+ensure_default_value(BIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin")
+ensure_default_value(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include")
+ensure_default_value(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
+ensure_default_value(LIBEXEC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/libexec")
+ensure_default_value(SHARE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/share")
+ensure_default_value(LOCALE_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/locale")
+ensure_default_value(SYSCONF_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/etc")
 
 # ******************************
 # Special directories
@@ -157,7 +171,7 @@ add_printable_variable_path(SYSCONF_INSTALL_DIR "Install directory for system co
 # If you add something here, consider whether or not you also
 # need to add it to one or more .pc.in files (for Connector, etc)
 
-set(privdatadir "${SHARE_INSTALL_DIR}/${PROJECT_NAME}")
+set(privdatadir "${SHARE_INSTALL_PREFIX}/${PROJECT_NAME}")
 set(privincludedir "${INCLUDE_INSTALL_DIR}/${PROJECT_NAME}")
 set(privlibdir "${LIB_INSTALL_DIR}/${PROJECT_NAME}")
 set(privlibexecdir "${LIBEXEC_INSTALL_DIR}/${PROJECT_NAME}")
@@ -173,7 +187,7 @@ else(WIN32)
 	set(privsolibdir "${privlibdir}")
 endif(WIN32)
 
-set(imagesdir "${SHARE_INSTALL_DIR}/pixmaps/${PROJECT_NAME}")
+set(imagesdir "${SHARE_INSTALL_PREFIX}/pixmaps/${PROJECT_NAME}")
 set(moduledir "${privlibdir}/registry-modules")
 set(credentialmoduledir "${privlibdir}/credential-modules")
 set(ebook_backenddir "${privlibdir}/addressbook-backends")
@@ -194,7 +208,7 @@ if(WIN32 AND (NOT ("$ENV{WIN32_SERVICELIBEXECDIR}" STREQUAL "")))
 	set(servicelibexecdir "$ENV{WIN32_SERVICELIBEXECDIR}")
 endif(WIN32 AND (NOT ("$ENV{WIN32_SERVICELIBEXECDIR}" STREQUAL "")))
 
-add_printable_variable_path(WITH_DBUS_SERVICE_DIR "Set directory for D-Bus service files" "${SHARE_INSTALL_DIR}/dbus-1/services")
+add_printable_variable_path(WITH_DBUS_SERVICE_DIR "Set directory for D-Bus service files" "${SHARE_INSTALL_PREFIX}/dbus-1/services")
 
 # It is correct for this to be in ${CMAKE_INSTALL_PREFIX}/lib, even on systems where that
 # does not match ${LIB_INSTALL_DIR}. This is what systemd uses on such platforms.
diff --git a/cmake/modules/FindIntltool.cmake b/cmake/modules/FindIntltool.cmake
index f6f27fe50..a2c35471e 100644
--- a/cmake/modules/FindIntltool.cmake
+++ b/cmake/modules/FindIntltool.cmake
@@ -39,7 +39,7 @@
 #
 # add_appdata_file(_infilename _outfilename)
 #    A shortcut to call intltool-merge() for an appdata file and install it
-#    to ${SHARE_INSTALL_DIR}/appdata
+#    to ${SHARE_INSTALL_PREFIX}/appdata
 
 include(FindGettext)
 
@@ -204,6 +204,6 @@ macro(add_appdata_file _infilename _outfilename)
 	add_dependencies(appdata-files appdata-${_outtarget})
 
 	install(FILES ${_out}
-		DESTINATION ${SHARE_INSTALL_DIR}/appdata
+		DESTINATION ${SHARE_INSTALL_PREFIX}/appdata
 	)
 endmacro(add_appdata_file)
diff --git a/cmake/modules/GLibTools.cmake b/cmake/modules/GLibTools.cmake
index ba0582422..d6728bedc 100644
--- a/cmake/modules/GLibTools.cmake
+++ b/cmake/modules/GLibTools.cmake
@@ -193,7 +193,7 @@ if(NOT GLIB_COMPILE_SCHEMAS)
 	message(FATAL_ERROR "Cannot find glib-compile-schemas, which is required to build ${PROJECT_NAME}")
 endif(NOT GLIB_COMPILE_SCHEMAS)
 
-set(GSETTINGS_SCHEMAS_DIR "${SHARE_INSTALL_DIR}/glib-2.0/schemas/")
+set(GSETTINGS_SCHEMAS_DIR "${SHARE_INSTALL_PREFIX}/glib-2.0/schemas/")
 
 macro(add_gsettings_schemas _target _schema0)
 	set(_install_code)
diff --git a/cmake/modules/GObjectIntrospection.cmake b/cmake/modules/GObjectIntrospection.cmake
index f18588d1f..ea30108de 100644
--- a/cmake/modules/GObjectIntrospection.cmake
+++ b/cmake/modules/GObjectIntrospection.cmake
@@ -123,7 +123,7 @@ macro(gir_add_introspection gir)
 			VERBATIM
 		)
 		list(APPEND _gir_girs ${CMAKE_CURRENT_BINARY_DIR}/${gir})
-		install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${gir} DESTINATION ${SHARE_INSTALL_DIR}/gir-1.0)
+		install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${gir} DESTINATION ${SHARE_INSTALL_PREFIX}/gir-1.0)
 		add_custom_target(gir-girs-${_gir_name} ALL DEPENDS ${_gir_girs})
 
 		if(NOT DEFINED ${_gir_name}_SKIP_TYPELIB OR NOT ${${_gir_name}_SKIP_TYPELIB})
diff --git a/cmake/modules/GtkDoc.cmake b/cmake/modules/GtkDoc.cmake
index 4aa286ae2..564083828 100644
--- a/cmake/modules/GtkDoc.cmake
+++ b/cmake/modules/GtkDoc.cmake
@@ -48,7 +48,7 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign
 		@ONLY
 	)
 
-	set(OUTPUT_DOCDIR ${SHARE_INSTALL_DIR}/gtk-doc/html/${_module})
+	set(OUTPUT_DOCDIR ${SHARE_INSTALL_PREFIX}/gtk-doc/html/${_module})
 
 	set(_ignore_headers)
 	foreach(_header ${${_ignoreheadersvar}})
diff --git a/cmake/modules/InstalledTests.cmake b/cmake/modules/InstalledTests.cmake
index ec445539c..82380fa02 100644
--- a/cmake/modules/InstalledTests.cmake
+++ b/cmake/modules/InstalledTests.cmake
@@ -20,7 +20,7 @@ include(PrintableOptions)
 add_printable_option(ENABLE_INSTALLED_TESTS "Enable installed tests" OFF)
 
 set(INSTALLED_TESTS_EXEC_DIR ${privlibexecdir}/installed-tests)
-set(INSTALLED_TESTS_META_DIR ${SHARE_INSTALL_DIR}/installed-tests/${PROJECT_NAME})
+set(INSTALLED_TESTS_META_DIR ${SHARE_INSTALL_PREFIX}/installed-tests/${PROJECT_NAME})
 
 macro(install_test_if_enabled _test_target _type _environ)
 	if(ENABLE_INSTALLED_TESTS)
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 2a64e4b56..e1714ea18 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -32,7 +32,7 @@ add_gsettings_schemas(data-files ${BUILT_SCHEMAS})
 # ********************************
 
 install(FILES evolution-data-server.convert
-	DESTINATION ${SHARE_INSTALL_DIR}/GConf/gsettings
+	DESTINATION ${SHARE_INSTALL_PREFIX}/GConf/gsettings
 )
 
 # ********************************
diff --git a/evolution-data-server.pc.in b/evolution-data-server.pc.in
index 34bd2716d..13c4cc086 100644
--- a/evolution-data-server.pc.in
+++ b/evolution-data-server.pc.in
@@ -2,8 +2,8 @@ prefix=@CMAKE_INSTALL_PREFIX@
 libdir=@LIB_INSTALL_DIR@
 includedir=@INCLUDE_INSTALL_DIR@
 privlibdir=@privlibdir@
-datarootdir=@SHARE_INSTALL_DIR@
-datadir=@SHARE_INSTALL_DIR@
+datarootdir=@SHARE_INSTALL_PREFIX@
+datadir=@SHARE_INSTALL_PREFIX@
 privdatadir=@privdatadir@
 
 execversion=@BASE_VERSION@
diff --git a/src/addressbook/libebook-contacts/libebook-contacts.pc.in b/src/addressbook/libebook-contacts/libebook-contacts.pc.in
index 30c4955ce..8c5b468a8 100644
--- a/src/addressbook/libebook-contacts/libebook-contacts.pc.in
+++ b/src/addressbook/libebook-contacts/libebook-contacts.pc.in
@@ -1,8 +1,8 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 libdir=@LIB_INSTALL_DIR@
 includedir=@INCLUDE_INSTALL_DIR@
-datarootdir=@SHARE_INSTALL_DIR@
-datadir=@SHARE_INSTALL_DIR@
+datarootdir=@SHARE_INSTALL_PREFIX@
+datadir=@SHARE_INSTALL_PREFIX@
 
 privincludedir=@privincludedir@
 
diff --git a/src/addressbook/libebook/libebook.pc.in b/src/addressbook/libebook/libebook.pc.in
index c5b2ed2b2..97ea97c94 100644
--- a/src/addressbook/libebook/libebook.pc.in
+++ b/src/addressbook/libebook/libebook.pc.in
@@ -1,8 +1,8 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 libdir=@LIB_INSTALL_DIR@
 includedir=@INCLUDE_INSTALL_DIR@
-datarootdir=@SHARE_INSTALL_DIR@
-datadir=@SHARE_INSTALL_DIR@
+datarootdir=@SHARE_INSTALL_PREFIX@
+datadir=@SHARE_INSTALL_PREFIX@
 
 privincludedir=@privincludedir@
 
diff --git a/src/addressbook/libedata-book/libedata-book.pc.in b/src/addressbook/libedata-book/libedata-book.pc.in
index 606edcf55..d910f46a0 100644
--- a/src/addressbook/libedata-book/libedata-book.pc.in
+++ b/src/addressbook/libedata-book/libedata-book.pc.in
@@ -2,8 +2,8 @@ prefix=@CMAKE_INSTALL_PREFIX@
 libdir=@LIB_INSTALL_DIR@
 libexecdir=@LIBEXEC_INSTALL_DIR@
 includedir=@INCLUDE_INSTALL_DIR@
-datarootdir=@SHARE_INSTALL_DIR@
-datadir=@SHARE_INSTALL_DIR@
+datarootdir=@SHARE_INSTALL_PREFIX@
+datadir=@SHARE_INSTALL_PREFIX@
 
 privlibdir=@privlibdir@
 privincludedir=@privincludedir@
diff --git a/src/calendar/libecal/libecal.pc.in b/src/calendar/libecal/libecal.pc.in
index 9adfa0460..ac2f07499 100644
--- a/src/calendar/libecal/libecal.pc.in
+++ b/src/calendar/libecal/libecal.pc.in
@@ -1,8 +1,8 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 libdir=@LIB_INSTALL_DIR@
 includedir=@INCLUDE_INSTALL_DIR@
-datarootdir=@SHARE_INSTALL_DIR@
-datadir=@SHARE_INSTALL_DIR@
+datarootdir=@SHARE_INSTALL_PREFIX@
+datadir=@SHARE_INSTALL_PREFIX@
 
 privincludedir=@privincludedir@
 
diff --git a/src/calendar/libedata-cal/libedata-cal.pc.in b/src/calendar/libedata-cal/libedata-cal.pc.in
index bdbeda61c..da2670892 100644
--- a/src/calendar/libedata-cal/libedata-cal.pc.in
+++ b/src/calendar/libedata-cal/libedata-cal.pc.in
@@ -2,8 +2,8 @@ prefix=@CMAKE_INSTALL_PREFIX@
 libdir=@LIB_INSTALL_DIR@
 libexecdir=@LIBEXEC_INSTALL_DIR@
 includedir=@INCLUDE_INSTALL_DIR@
-datarootdir=@SHARE_INSTALL_DIR@
-datadir=@SHARE_INSTALL_DIR@
+datarootdir=@SHARE_INSTALL_PREFIX@
+datadir=@SHARE_INSTALL_PREFIX@
 
 privlibdir=@privlibdir@
 privincludedir=@privincludedir@
diff --git a/src/libebackend/libebackend.pc.in b/src/libebackend/libebackend.pc.in
index 176601cb2..ba1943850 100644
--- a/src/libebackend/libebackend.pc.in
+++ b/src/libebackend/libebackend.pc.in
@@ -1,8 +1,8 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 libdir=@LIB_INSTALL_DIR@
 includedir=@INCLUDE_INSTALL_DIR@
-datarootdir=@SHARE_INSTALL_DIR@
-datadir=@SHARE_INSTALL_DIR@
+datarootdir=@SHARE_INSTALL_PREFIX@
+datadir=@SHARE_INSTALL_PREFIX@
 
 privlibdir=@privlibdir@
 privincludedir=@privincludedir@
diff --git a/src/libedataserver/libedataserver.pc.in b/src/libedataserver/libedataserver.pc.in
index 9b04279df..f34d5a6f5 100644
--- a/src/libedataserver/libedataserver.pc.in
+++ b/src/libedataserver/libedataserver.pc.in
@@ -1,8 +1,8 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 libdir=@LIB_INSTALL_DIR@
 includedir=@INCLUDE_INSTALL_DIR@
-datarootdir=@SHARE_INSTALL_DIR@
-datadir=@SHARE_INSTALL_DIR@
+datarootdir=@SHARE_INSTALL_PREFIX@
+datadir=@SHARE_INSTALL_PREFIX@
 
 privlibdir=@privlibdir@
 privincludedir=@privincludedir@
diff --git a/src/libedataserverui/libedataserverui.pc.in b/src/libedataserverui/libedataserverui.pc.in
index 90e478e2b..c3fae5f3b 100644
--- a/src/libedataserverui/libedataserverui.pc.in
+++ b/src/libedataserverui/libedataserverui.pc.in
@@ -2,8 +2,8 @@ prefix=@CMAKE_INSTALL_PREFIX@
 libdir=@LIB_INSTALL_DIR@
 libexecdir=@LIBEXEC_INSTALL_DIR@
 includedir=@INCLUDE_INSTALL_DIR@
-datarootdir=@SHARE_INSTALL_DIR@
-datadir=@SHARE_INSTALL_DIR@
+datarootdir=@SHARE_INSTALL_PREFIX@
+datadir=@SHARE_INSTALL_PREFIX@
 
 privlibdir=@privlibdir@
 privincludedir=@privincludedir@
diff --git a/src/modules/ubuntu-online-accounts/CMakeLists.txt b/src/modules/ubuntu-online-accounts/CMakeLists.txt
index 4eeb7c8d7..eee9025f5 100644
--- a/src/modules/ubuntu-online-accounts/CMakeLists.txt
+++ b/src/modules/ubuntu-online-accounts/CMakeLists.txt
@@ -60,7 +60,7 @@ foreach(_file IN LISTS service_files)
 	list(APPEND filedeps ${CMAKE_CURRENT_BINARY_DIR}/${_file})
 endforeach(_file)
 
-set(desktopdir ${SHARE_INSTALL_DIR}/applications)
+set(desktopdir ${SHARE_INSTALL_PREFIX}/applications)
 pkg_check_variable(libaccountsprefixdir libaccounts-glib prefix)
 pkg_check_variable(applicationdir libaccounts-glib applicationfilesdir)
 pkg_check_variable(servicetypedir libaccounts-glib servicetypefilesdir)
diff --git a/src/vala/CMakeLists.txt b/src/vala/CMakeLists.txt
index 9fde4f244..04439ce89 100644
--- a/src/vala/CMakeLists.txt
+++ b/src/vala/CMakeLists.txt
@@ -137,5 +137,5 @@ add_custom_target(vala-files
 add_dependencies(vala vala-files)
 
 install(FILES ${valafiles}
-	DESTINATION ${SHARE_INSTALL_DIR}/vala/vapi
+	DESTINATION ${SHARE_INSTALL_PREFIX}/vala/vapi
 )
diff --git a/tests/libedata-book/CMakeLists.txt b/tests/libedata-book/CMakeLists.txt
index 17f328df3..5619066b0 100644
--- a/tests/libedata-book/CMakeLists.txt
+++ b/tests/libedata-book/CMakeLists.txt
@@ -11,7 +11,7 @@ set(extra_defines
 	-DSRCDIR=\"${CMAKE_CURRENT_SOURCE_DIR}\"
 	-DINSTALLED_TEST_DIR=\"${INSTALLED_TESTS_EXEC_DIR}\"
 	-DBACKENDDIR=\"${ebook_backenddir}\"
-	-DDATADIR=\"${SHARE_INSTALL_DIR}\"
+	-DDATADIR=\"${SHARE_INSTALL_PREFIX}\"
 	-DBUILDDIR=\"${CAMKE_BINARY_DIR}\"
 	-DCAMEL_PROVIDERDIR=\"${camel_providerdir}\"
 )