AzureStorage doesn't use GnuInstallDirs

CMake/BuildAzure.cmake

@@ -6,9 +6,9 @@ function(BuildAzure)
   elseif (APPLE)
     list(APPEND AZURE_LIBS_LIST "lib/libwastorage.dylib")
   else()
-    list(APPEND AZURE_LIBS_LIST "lib${LIBSUFFIX}/libazurestorage.so.7.0")
-    list(APPEND AZURE_LIBS_LIST "lib${LIBSUFFIX}/libazurestorage.so.7")
-    list(APPEND AZURE_LIBS_LIST "lib${LIBSUFFIX}/libazurestorage.so")
+    list(APPEND AZURE_LIBS_LIST "lib/libazurestorage.so.7.0")
+    list(APPEND AZURE_LIBS_LIST "lib/libazurestorage.so.7")
+    list(APPEND AZURE_LIBS_LIST "lib/libazurestorage.so")
   endif()
   set(AzureCmakeDir "${azure-storage-cpp_SOURCE_DIR}/Microsoft.WindowsAzure.Storage")
   if (WIN32)

CMakeLists.txt

@@ -14,17 +14,11 @@ set (TEST_AWS_OBJECTID "" CACHE STRING "Test AWS object ID")
 set(OPENVDS_LIBDIR_SUFFIX "" CACHE STRING "Suffix to add to lib directories on linux")
 option(FORCE_NO_LIBDIR_SUFFIX "Force there to be no suffix on lib directories linux")
 
-if (FORCE_NO_LIBDIR_SUFFIX)
-  set(LIBSUFFIX "")
-elseif (OPENVDS_LIBDIR_SUFFIX)
-  set(LIBSUFFIX ${OPENVDS_LIBDIR_SUFFIX})
-else()
-  get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
-  if ("${LIB64}" STREQUAL "TRUE")
+get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
+if ("${LIB64}" STREQUAL "TRUE")
   set(LIBSUFFIX 64)
-  else()
+else()
   set(LIBSUFFIX "")
-  endif()
 endif()
 
 set(BUILD_PYTHON_DEFAULT ON)