From 2acc919714018bf1a43b72a2aab9b813b63a70b3 Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Thu, 16 Feb 2017 09:49:39 +0100
Subject: [PATCH] Get rid of legacy dbus-1.0 include dir location.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=99834

Include dir location is now 'dbus-1' similar to other install locations.
---
 cmake/DBus1Config.cmake.in | 6 +++---
 cmake/dbus/CMakeLists.txt  | 4 ++--
 dbus-1.pc.in               | 2 +-
 dbus/Makefile.am           | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cmake/DBus1Config.cmake.in b/cmake/DBus1Config.cmake.in
index 78e2787..290b798 100644
--- a/cmake/DBus1Config.cmake.in
+++ b/cmake/DBus1Config.cmake.in
@@ -26,7 +26,7 @@ if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/DBus1Targets.cmake") # installed on Windows
         include("${CMAKE_CURRENT_LIST_DIR}/DBus1Targets.cmake")
     endif()
 
-    set(DBus1_INCLUDE_DIRS "${DBus1_INSTALL_DIR}/@CMAKE_INSTALL_INCLUDEDIR@/dbus-1.0" "${DBus1_INSTALL_DIR}/@CMAKE_INSTALL_LIBDIR@/dbus-1.0/include")
+    set(DBus1_INCLUDE_DIRS "${DBus1_INSTALL_DIR}/@CMAKE_INSTALL_INCLUDEDIR@/dbus-1" "${DBus1_INSTALL_DIR}/@CMAKE_INSTALL_LIBDIR@/dbus-1/include")
     set(DBus1_DEFINITIONS)
     set(DBus1_LIBRARIES dbus-1)
 
@@ -47,10 +47,10 @@ else() # installed from Autotools and/or on Unix
     # because cmake provides more search options
     find_path(DBus1_INCLUDE_DIR dbus/dbus.h
         HINTS ${PC_DBUS1_INCLUDEDIR} ${PC_DBUS1_INCLUDE_DIRS}
-        PATH_SUFFIXES dbus-1.0)
+        PATH_SUFFIXES dbus-1)
     find_path(DBus1_ARCH_INCLUDE_DIR dbus/dbus-arch-deps.h
         HINTS ${PC_DBUS1_INCLUDE_DIRS}
-        PATH_SUFFIXES dbus-1.0)
+        PATH_SUFFIXES dbus-1)
     find_library(DBus1_LIBRARY NAMES ${PC_DBUS1_LIBRARIES}
         HINTS ${PC_DBUS1_LIBDIR} ${PC_DBUS1_LIBRARY_DIRS})
 
diff --git a/cmake/dbus/CMakeLists.txt b/cmake/dbus/CMakeLists.txt
index 86484a9..3b8c767 100644
--- a/cmake/dbus/CMakeLists.txt
+++ b/cmake/dbus/CMakeLists.txt
@@ -306,8 +306,8 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
 endif("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
 
 install(TARGETS dbus-1 ${INSTALL_TARGETS_DEFAULT_ARGS})
-install(FILES ${dbusinclude_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dbus-1.0/dbus)
-install(FILES ${dbusinclude_ARCH_HEADERS} DESTINATION ${CMAKE_INSTALL_LIBDIR}/dbus-1.0/include/dbus)
+install(FILES ${dbusinclude_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dbus-1/dbus)
+install(FILES ${dbusinclude_ARCH_HEADERS} DESTINATION ${CMAKE_INSTALL_LIBDIR}/dbus-1/include/dbus)
 
 ### Internal library, used for the daemon, tools and tests, compiled statically.
 
diff --git a/dbus-1.pc.in b/dbus-1.pc.in
index 26fc970..0627743 100644
--- a/dbus-1.pc.in
+++ b/dbus-1.pc.in
@@ -17,4 +17,4 @@ Description: Free desktop message bus
 Version: @VERSION@
 Libs: -L${libdir} -ldbus-1
 Libs.private: @LIBDBUS_LIBS@
-Cflags: -I${includedir}/dbus-1.0 -I${libdir}/dbus-1.0/include @DBUS_STATIC_BUILD_CPPFLAGS@
+Cflags: -I${includedir}/dbus-1 -I${libdir}/dbus-1/include @DBUS_STATIC_BUILD_CPPFLAGS@
diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index e4aa2ee..fefb2e3 100644
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -31,8 +31,8 @@ endif
 # if assertions are enabled, improve backtraces
 AM_LDFLAGS = @R_DYNAMIC_LDFLAG@
 
-dbusincludedir=$(includedir)/dbus-1.0/dbus
-dbusarchincludedir=$(libdir)/dbus-1.0/include/dbus
+dbusincludedir=$(includedir)/dbus-1/dbus
+dbusarchincludedir=$(libdir)/dbus-1/include/dbus
 
 lib_LTLIBRARIES=libdbus-1.la
 
-- 
1.8.4.5