diff --git a/bin/Makefile.am b/bin/Makefile.am index 1d30d435c42108ab2659df9fcd547fa393a1f779..9366c7a7161ec5d030bcfa637768408f60c47ea5 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,5 +1,5 @@ if HAVE_WIN32 -libexec_PROGRAMS = ringcli +bin_PROGRAMS = ringcli ringcli_SOURCES = winmain.cpp ringcli_CXXFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/src/dring \ @@ -8,7 +8,7 @@ ringcli_LDADD = $(top_builddir)/src/libring.la endif if HAVE_OSX -libexec_PROGRAMS = ringcli +bin_PROGRAMS = ringcli ringcli_SOURCES = osxmain.cpp ringcli_CXXFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/src/dring \ @@ -19,7 +19,7 @@ endif if RING_DBUS SUBDIRS=dbus -libexec_PROGRAMS = dring +sbin_PROGRAMS = dring dring_SOURCES = main.cpp diff --git a/bin/dbus/cx.ring.Ring.service.in b/bin/dbus/cx.ring.Ring.service.in index 253b6798bbb7ffcf7c7b0d6a09f4c8d2769b1352..4e27a6422edc49ec369c6ddf574279ca2762f6ee 100644 --- a/bin/dbus/cx.ring.Ring.service.in +++ b/bin/dbus/cx.ring.Ring.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=cx.ring.Ring -Exec=@LIBEXECDIR@/dring +Exec=/usr/sbin/dring diff --git a/configure.ac b/configure.ac index e85cbd6f3df668decdd0773225c53c35700a77ca..6ed57353661365b6424c7417827822cff154bc17 100644 --- a/configure.ac +++ b/configure.ac @@ -366,9 +366,6 @@ AC_ARG_WITH([dbus], AS_IF([test "x$with_dbus" = "xyes"], [ PKG_CHECK_MODULES(DBUSCPP, dbus-c++-1,, AC_MSG_WARN([Missing dbus development files])) - AS_AC_EXPAND(LIBEXECDIR, $libexecdir) - AC_SUBST(LIBEXECDIR) - AC_CONFIG_FILES([bin/dbus/Makefile bin/dbus/cx.ring.Ring.service])