Build fix, if ROOTDIR was set linking failed. Use TOPDIR internally.

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

Makefile

@@ -39,6 +39,7 @@ SRCS        = $(OBJS:.o=.c)
 DEPS        = $(addprefix .,$(SRCS:.c=.d))
 
 # Installation paths, always prepended with DESTDIR if set
+TOPDIR      = $(shell pwd)
 prefix     ?= /usr
 sysconfdir ?= /etc
 sbindir    ?= /sbin
@@ -60,7 +61,7 @@ CPPFLAGS   += -Ilibite -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_GNU_SOURCE
 CPPFLAGS   += -DVERSION=\"$(VERSION)\" -DWHOAMI=\"`whoami`@`hostname`\"
 CPPFLAGS   += -DFINIT_FIFO=\"$(FINIT_FIFO)\" -DFINIT_CONF=\"$(FINIT_CONF)\"
 CPPFLAGS   += -DFINIT_RCSD=\"$(FINIT_RCSD)\" -DPLUGIN_PATH=\"$(plugindir)\"
-LDFLAGS    += -rdynamic -L$(ROOTDIR)/libite
+LDFLAGS    += -rdynamic -L$(TOPDIR)/libite
 DEPLIBS     = libite/libite.so
 LDLIBS     += -ldl -lite
 

common.mk

@@ -1,5 +1,5 @@
 # Top directory for building complete system, fall back to this directory
-ROOTDIR    ?= $(shell pwd)
+ROOTDIR    ?= $(TOPDIR)
 
 # Some junk files we always want to be removed when doing a make clean.
 JUNK        = *~ *.bak *.aux *.dvi *.idx *.ind *.log *.ps *.map .*.d DEADJOE semantic.cache *.gdb *.elf core core.*

plugins/Makefile

@@ -6,6 +6,7 @@ LDFLAGS    += -shared
 PLUGINS    ?= initctl.so alsa-utils.so bootmisc.so dbus.so hwclock.so \
 	      resolvconf.so urandom.so x11-common.so tty.so
 DEPS        = $(addprefix .,$(PLUGINS:.so=.d))
+TOPDIR     ?= $(shell pwd)
 
 include ../common.mk