Skip to content

Commit 10b2c62

Browse files
committed
dbus: Use relative folders for directories
Use relative folders due to this change: conan-io/conan#15706 Remove the useless attempt to modify the separators used for the prefix path. The separators are still inconsistent for the prefix and exec_prefix on Windows. They use both backslashes and forward slashes.
1 parent a642ea3 commit 10b2c62

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

recipes/dbus/1.x.x/conanfile.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,13 +115,11 @@ def generate(self):
115115
env = VirtualBuildEnv(self)
116116
env.generate()
117117
tc = MesonToolchain(self)
118-
if self.settings.os == "Windows":
119-
tc.project_options["prefix"] = self.package_folder.replace("\\", "/")
120118
tc.project_options["asserts"] = not is_apple_os(self)
121119
tc.project_options["checks"] = False
122-
tc.project_options["datadir"] = os.path.join(self.package_folder, "res", "share")
123-
tc.project_options["localstatedir"] = os.path.join(self.package_folder, "res", "var")
124-
tc.project_options["sysconfdir"] = os.path.join(self.package_folder, "res", "etc")
120+
tc.project_options["datadir"] = "res/share"
121+
tc.project_options["localstatedir"] = "res/var"
122+
tc.project_options["sysconfdir"] = "res/etc"
125123
tc.project_options["doxygen_docs"] = "disabled"
126124
tc.project_options["ducktype_docs"] = "disabled"
127125
tc.project_options["qt_help"] = "disabled"

0 commit comments

Comments
 (0)