-
- Downloads
daemon: Use the PROGSHAREDIR macro to refer to the custom datadir.
The sources previously hard-coded the location of the default Jami ringtone as "/usr/share/ring/ringtones/default.opus". It should instead be computed from the already existing PROGSHAREDIR macro, which is built from Autoconf's configurable datadir. * globals.mk (-DPROGSHAREDIR): Rename the 'ring' subdirectory to 'jami'. * meson.build (conf): Likewise. * ringtones/Makefile.am (dist_jamiringtones_DATA): s/ring/jami/g * ringtones/meson.build: Likewise. * src/account.cpp (DEFAULT_RINGTONE_PATH): Define in terms of PROGSHAREDIR. * bin/dbus/Makefile.am (libclient_dbus_la_CXXFLAGS): Remove extraneous flags, already propagated via AM_CPPFLAGS. Honor AM_CXXFLAGS. * src/client/Makefile.am (libclient_la_CXXFLAGS): Remove. * src/plugin/Makefile.am (libplugin_la_CXXFLAGS): Likewise. Change-Id: Icaa0a92e896f86b0bb07f82e4079570db08fafbd
Showing
- bin/dbus/Makefile.am 1 addition, 6 deletionsbin/dbus/Makefile.am
- globals.mk 1 addition, 1 deletionglobals.mk
- meson.build 1 addition, 1 deletionmeson.build
- ringtones/Makefile.am 3 additions, 3 deletionsringtones/Makefile.am
- ringtones/meson.build 1 addition, 1 deletionringtones/meson.build
- src/account.cpp 3 additions, 3 deletionssrc/account.cpp
- src/client/Makefile.am 0 additions, 7 deletionssrc/client/Makefile.am
- src/plugin/Makefile.am 0 additions, 7 deletionssrc/plugin/Makefile.am
Loading