From 98cd6dffb191bc6e80eb7c82d2917620f3c636f7 Mon Sep 17 00:00:00 2001
From: Joachim Nilsson <troglobit@gmail.com>
Date: Sat, 19 Mar 2016 22:54:07 +0100
Subject: [PATCH] Fix build and install temporarily

This patch builds Finit dynamically, including both plugins and GIT
submodules for libite and libuev.  This causes libite.so and libuev.so
to be installed in a public path, which is not good if the user has
other versions of the same libraries already installed.

The correct fix is to remove the GIT submodules for now and require
users of Finit to build and install libite and libuev separately.

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
---
 Makefile.am | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 5f459f35..124edc6f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,17 +6,17 @@ if INETD
 finit_SOURCES      += inetd.c
 endif
 finit_CFLAGS       = -W -Wall -Wextra -std=gnu99
-finit_LDADD        = libite/libite.la libuev/libuev.la -ldl
+finit_LDADD        = libite/.libs/libite.la libuev/.libs/libuev.la -ldl
 if STATIC
 finit_LDADD       += plugins/libplug.la
 endif
 DEPENDENCIES       = libite/libite.la libuev/libuev.la
 initctl_SOURCES    = initctl.c svc.c helpers.c cond.c
-initctl_LDADD      = libite/libite.la
+initctl_LDADD      = libite/.libs/libite.la
 reboot_SOURCES     = reboot.c
 SYMLINK            = telinit init
-DIST_SUBDIRS       = libite libuev
-SUBDIRS            = plugins
+#DIST_SUBDIRS       = libite libuev
+SUBDIRS            = libite libuev plugins
 doc_DATA           = README.md LICENSE finit.conf services
 EXTRA_DIST         = README.md LICENSE ChangeLog.md finit.conf services
 AM_CPPFLAGS        = -U_FORTIFY_SOURCE
@@ -26,13 +26,15 @@ AM_CPPFLAGS       += -DFINIT_CONF=\"$(conf)\" -DFINIT_RCSD=\"$(rcsd)\" -DFINIT_F
 
 # Slightly ugly hacks to prevent the build system from installing
 # libuev/libite, which it does if we use the more plain SUBDIRS.
-$(DEPENDENCIES):
-	@$(MAKE) -C `dirname $@` all
-
-clean-local:
-	@-for dep in $(DEPENDENCIES); do			\
-		$(MAKE) -C `dirname $$dep` clean;		\
-	done
+#$(DEPENDENCIES):
+#	@$(MAKE) -C `dirname $@` all
+#
+#$(initctl_LDADD) $(finit_LDADD): $(DEPENDENCIES)
+#
+#clean-local:
+#	@-for dep in $(DEPENDENCIES); do			\
+#		$(MAKE) -C `dirname $$dep` clean;		\
+#	done
 
 # Hook in install to add finit --> telinit symlink(s)
 install-exec-hook: