build: fix make nsqadmin

nsqio · Apr 26, 2015 · 7e81199 · 7e81199
1 parent 1b12982
commit 7e81199
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -14,11 +14,10 @@ NSQ_TAIL_SRCS = $(wildcard apps/nsq_tail/*.go nsq/*.go internal/*/*.go)
 NSQ_STAT_SRCS = $(wildcard apps/nsq_stat/*.go internal/*/*.go)
 TO_NSQ_SRCS = $(wildcard apps/to_nsq/*.go internal/*/*.go)
 
-BINARIES = nsqadmin
-APPS = nsqlookupd nsqd nsq_pubsub nsq_to_nsq nsq_to_file nsq_to_http nsq_tail nsq_stat to_nsq
+APPS = nsqd nsqlookupd nsqadmin nsq_pubsub nsq_to_nsq nsq_to_file nsq_to_http nsq_tail nsq_stat to_nsq
 BLDDIR = build
 
-all: $(BINARIES) $(APPS)
+all: $(APPS)
 
 $(BLDDIR)/%:
 	@mkdir -p $(dir $@)
@@ -29,7 +28,7 @@ $(APPS): %: $(BLDDIR)/apps/%
 
 $(BLDDIR)/apps/nsqd: $(NSQD_SRCS)
 $(BLDDIR)/apps/nsqlookupd: $(NSQLOOKUPD_SRCS)
-$(BLDDIR)/nsqadmin: $(NSQADMIN_SRCS)
+$(BLDDIR)/apps/nsqadmin: $(NSQADMIN_SRCS)
 $(BLDDIR)/apps/nsq_pubsub: $(NSQ_PUBSUB_SRCS)
 $(BLDDIR)/apps/nsq_to_nsq: $(NSQ_TO_NSQ_SRCS)
 $(BLDDIR)/apps/nsq_to_file: $(NSQ_TO_FILE_SRCS)
@@ -49,7 +48,7 @@ install: $(BINARIES) $(EXAMPLES)
 	install -m 755 -d ${DESTDIR}${BINDIR}
 	install -m 755 $(BLDDIR)/apps/nsqlookupd ${DESTDIR}${BINDIR}/nsqlookupd
 	install -m 755 $(BLDDIR)/apps/nsqd ${DESTDIR}${BINDIR}/nsqd
-	install -m 755 $(BLDDIR)/nsqadmin ${DESTDIR}${BINDIR}/nsqadmin
+	install -m 755 $(BLDDIR)/apps/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
 	install -m 755 $(BLDDIR)/apps/nsq_to_file ${DESTDIR}${BINDIR}/nsq_to_file