From 6813a90665f94909a5c3164ad79cc8894e029b04 Mon Sep 17 00:00:00 2001
From: Matt Reiferson <mreiferson@gmail.com>
Date: Mon, 3 Feb 2014 15:26:47 -0500
Subject: [PATCH] fix makefile for relocated nsqlookupd

---
 Makefile | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index a559a33f9..d600e0fa2 100644
--- a/Makefile
+++ b/Makefile
@@ -13,22 +13,21 @@ NSQ_TO_HTTP_SRCS = $(wildcard apps/nsq_to_http/*.go nsq/*.go util/*.go)
 NSQ_TAIL_SRCS = $(wildcard apps/nsq_tail/*.go nsq/*.go util/*.go)
 NSQ_STAT_SRCS = $(wildcard apps/nsq_stat/*.go util/*.go util/lookupd/*.go)
 
-BINARIES = nsqd nsqlookupd nsqadmin
-EXAMPLES = nsq_pubsub nsq_to_nsq nsq_to_file nsq_to_http nsq_tail nsq_stat
+BINARIES = nsqd nsqadmin
+APPS = nsqlookupd nsq_pubsub nsq_to_nsq nsq_to_file nsq_to_http nsq_tail nsq_stat
 BLDDIR = build
 
-all: $(BINARIES) $(EXAMPLES)
+all: $(BINARIES) $(APPS)
 
 $(BLDDIR)/%:
 	mkdir -p $(dir $@)
 	go build ${GOFLAGS} -o $(abspath $@) ./$*
 
 $(BINARIES): %: $(BLDDIR)/%
-$(EXAMPLES): %: $(BLDDIR)/apps/%
+$(APPS): %: $(BLDDIR)/apps/%
 
-# Dependencies
 $(BLDDIR)/nsqd: $(NSQD_SRCS)
-$(BLDDIR)/nsqlookupd: $(NSQLOOKUPD_SRCS)
+$(BLDDIR)/apps/nsqlookupd: $(NSQLOOKUPD_SRCS)
 $(BLDDIR)/nsqadmin: $(NSQADMIN_SRCS)
 $(BLDDIR)/apps/nsq_pubsub: $(NSQ_PUBSUB_SRCS)
 $(BLDDIR)/apps/nsq_to_nsq: $(NSQ_TO_NSQ_SRCS)
@@ -40,17 +39,14 @@ $(BLDDIR)/apps/nsq_stat: $(NSQ_STAT_SRCS)
 clean:
 	rm -fr $(BLDDIR)
 
-# Targets
 .PHONY: install clean all
-# Programs
 .PHONY: $(BINARIES)
-# Examples
-.PHONY: $(EXAMPLES)
+.PHONY: $(APPS)
 
 install: $(BINARIES) $(EXAMPLES)
 	install -m 755 -d ${DESTDIR}${BINDIR}
 	install -m 755 $(BLDDIR)/nsqd ${DESTDIR}${BINDIR}/nsqd
-	install -m 755 $(BLDDIR)/nsqlookupd ${DESTDIR}${BINDIR}/nsqlookupd
+	install -m 755 $(BLDDIR)/apps/nsqlookupd ${DESTDIR}${BINDIR}/nsqlookupd
 	install -m 755 $(BLDDIR)/nsqadmin ${DESTDIR}${BINDIR}/nsqadmin
 	install -m 755 $(BLDDIR)/apps/nsq_pubsub ${DESTDIR}${BINDIR}/nsq_pubsub
 	install -m 755 $(BLDDIR)/apps/nsq_to_nsq ${DESTDIR}${BINDIR}/nsq_to_nsq