contrib: use "new" enabled/ directory for pre-enabled services

The initctl tool's enable/disable command can then be used to manage
these services after install.  This is what most users expect.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>

contrib/void/finit.d/Makefile.am

@@ -4,23 +4,18 @@ d_LINKS    = acpid.conf dhcpcd.conf getty.conf sshd.conf uuidd.conf
 
 install-exec-hook:
 	@$(MKDIR_P) $(DESTDIR)$(docsdir)/available
+	@$(MKDIR_P) $(DESTDIR)$(docsdir)/enabled
 	@for file in $(d_LINKS); do				\
-		lnk=$(DESTDIR)$(docsdir)/$$file;		\
+		lnk=$(DESTDIR)$(docsdir)/enabled/$$file;	\
 		src=available/$$file;				\
-		if [ -L $$lnk ]; then				\
-			echo "Skipping $$lnk exists.";		\
-		else						\
-			$(LN_S) $$src $$lnk;			\
-		fi;						\
+		rm -f $$lnk;					\
+		$(LN_S) ../$$src $$lnk;				\
 	done
 
 
 uninstall-hook:
 	@for file in $(d_LINKS); do				\
-		lnk=$(DESTDIR)$(docsdir)/$$file;		\
+		lnk=$(DESTDIR)$(docsdir)/enabled/$$file;	\
 		src=available/$$file;				\
-		if [ "`readlink $$lnk`" != "$$src" ]; then 	\
-			continue; 				\
-		fi;						\
-		$(RM) $$lnk;					\
+		$(RM) -f $$lnk;					\
 	done