summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2013-03-22 15:21:24 +0100
committerSamuel Ortiz <sameo@linux.intel.com>2013-03-22 15:21:24 +0100
commit94d3d302c1fd9efaed320b26f4f4df6516e1305a (patch)
tree30d3e36ae9fef2a696493eff36c8b64a3c532b6c
parentb64719f163f0514ac1fac63060323f55e5bf2000 (diff)
downloadneard-94d3d302c1fd9efaed320b26f4f4df6516e1305a.tar.gz
neard-94d3d302c1fd9efaed320b26f4f4df6516e1305a.tar.bz2
neard-94d3d302c1fd9efaed320b26f4f4df6516e1305a.zip
configure: Remove init script skeleton
All distros use their own flavor of it, and several are systemd based. An init script skeleton is probably useless.
-rw-r--r--Makefile.am5
-rw-r--r--configure.ac2
-rw-r--r--scripts/neard.in42
3 files changed, 1 insertions, 48 deletions
diff --git a/Makefile.am b/Makefile.am
index 9c1537d..a276ed3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -49,7 +49,6 @@ nodist_src_neard_SOURCES = src/builtin.h
AM_CFLAGS = @GLIB_CFLAGS@ @DBUS_CFLAGS@ @NETLINK_CFLAGS@ $(builtin_cflags) \
-DNEAR_PLUGIN_BUILTIN \
-DPLUGINDIR=\""$(plugindir)"\" \
- -DSCRIPTDIR=\""$(build_scriptdir)"\" \
-DCONFIGDIR=\""$(configdir)\""
AM_CPPFLAGS = -I$(builddir)/include -I$(builddir)/src -I$(srcdir)/gdbus
@@ -58,8 +57,6 @@ CLEANFILES = src/builtin.h $(local_headers)
plugindir = $(libdir)/near/plugins
-scriptdir = $(libdir)/connman/scripts
-
configdir = ${sysconfdir}/neard
dist_noinst_DATA = src/main.conf
@@ -70,10 +67,8 @@ dist_dbus_DATA = src/org.neard.conf
if MAINTAINER_MODE
build_plugindir = $(abs_top_srcdir)/plugins/.libs
-build_scriptdir = $(abs_top_srcdir)/scripts
else
build_plugindir = $(plugindir)
-build_scriptdir = $(scriptdir)
endif
doc_files = doc/manager-api.txt doc/tag-api.txt doc/device-api.txt \
diff --git a/configure.ac b/configure.ac
index 0361cc6..cb655a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -134,4 +134,4 @@ AC_ARG_ENABLE(p2p, AC_HELP_STRING([--disable-p2p],
[enable_p2p=${enableval}])
AM_CONDITIONAL(P2P, test "${enable_p2p}" != "no")
-AC_OUTPUT(Makefile include/version.h neard.pc scripts/neard)
+AC_OUTPUT(Makefile include/version.h neard.pc)
diff --git a/scripts/neard.in b/scripts/neard.in
deleted file mode 100644
index 0a839ad..0000000
--- a/scripts/neard.in
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-DAEMON=@libexecdir@/nfc/neard
-DESC="NFC daemon"
-
-. /lib/lsb/init-functions
-
-set -e
-
-do_start() {
- start-stop-daemon --start --oknodo --exec $DAEMON -- $DAEMON_OPTS
-}
-
-do_stop() {
- start-stop-daemon --stop --oknodo --quiet --exec $DAEMON
-}
-
-case "$1" in
- start)
- log_daemon_msg "Starting $DESC"
- do_start
- log_end_msg $?
- ;;
- stop)
- log_daemon_msg "Stopping $DESC"
- do_stop
- log_end_msg $?
- ;;
- restart|force-reload)
- log_daemon_msg "Restarting $DESC"
- do_stop
- sleep 1
- do_start
- log_end_msg $?
- ;;
- *)
- log_success_msg "Usage: $0 {start|stop|restart|force-reload}" >&2
- exit 1
- ;;
-esac
-
-exit 0