added rpm build option for upstart and systemd

Makefile

@@ -11,6 +11,8 @@ VERSION=$(APP_VERSION)_$(shell git rev-parse --short HEAD)
 
 BUILD_SERVER=''
 
+SYSTEM_INIT=systemd
+
 DIST=DIST/
 REMOTE_DIST=$(PROG)-$(DIST)
 
@@ -44,12 +46,20 @@ endif
 dist: clean linux
 
 	mkdir -p $(DIST)opt/ecix/birdwatcher/bin
-	mkdir -p $(DIST)etc/systemd
 	mkdir -p $(DIST)etc/ecix
 
+ifeq ($(SYSTEM_INIT), systemd)
+	# Installing systemd services
+	mkdir -p $(DIST)usr/lib/systemd/system/
+	cp install/systemd/* $(DIST)usr/lib/systemd/system/.
+else
+	# Installing upstart configuration
+	mkdir -p $(DIST)/etc/init/
+	cp install/upstart/init/* $(DIST)etc/init/.
+endif
+
 
 	# Copy config and startup script
-	cp etc/systemd/* DIST/etc/systemd/.
 	cp etc/ecix/* DIST/etc/ecix/.
 	rm -f DIST/etc/ecix/*.local.*
 

etc/systemd/birdwatcher.target

@@ -1,6 +0,0 @@
-[Unit]
-Wants=birdwatcher4.service birdwatcher6.service
-
-[Install]
-WantedBy=multi-user.target
-

install/systemd/birdwatcher4.service

@@ -1,11 +1,11 @@
-
 [Unit]
-Description=Birdwatcher (IPv4)
+Description=BIRDwatcher IPv4 
+Wants=network.target
 After=network.target
 
 [Service]
+Type=simple
 ExecStart=/opt/ecix/birdwatcher/bin/birdwatcher-linux-amd64
 
 [Install]
 WantedBy=multi-user.target
-

install/systemd/birdwatcher6.service

@@ -1,11 +1,11 @@
-
 [Unit]
-Description=Birdwatcher (IPv6)
+Description=BIRDwatcher IPv6 
+Wants=network.target
 After=network.target
 
 [Service]
+Type=simple
 ExecStart=/opt/ecix/birdwatcher/bin/birdwatcher-linux-amd64 -6
 
 [Install]
 WantedBy=multi-user.target
-