From 491553fcb350562812d5dd1f5c9cbf0d472c2ba4 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Wed, 15 Jun 2016 21:36:06 -0400
Subject: nshd: use meta-cat

---
 Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index b03c431..ee7c69b 100644
--- a/Makefile
+++ b/Makefile
@@ -55,11 +55,11 @@ $(srcdir)/LICENSE.apache-2.0.txt: $(NET)
 $(srcdir)/LICENSE.wtfpl-2.txt: $(NET)
 	curl http://www.wtfpl.net/txt/copying/ > $@
 
-$(outdir)/bin/nshd: private golang.FLAGS+=-ldflags '-X nshd.conf_file=$(conf_file)'
 $(outdir)/bin/nshd: src/lukeshu.com/git/go/libnslcd.git/proto/server/interface_backend.go
 $(outdir)/bin/nshd: src/lukeshu.com/git/go/libnslcd.git/proto/server/func_handlerequest.go
 $(outdir)/bin/nshd: src/lukeshu.com/git/go/libnslcd.git/proto/server/type_nilbackend.go                                                     
-$(outdir)/bin/nshd: $(call golang.src,$(srcdir)) $(var)conf_file
+$(outdir)/bin/nshd: src/nshd/main.go
+$(outdir)/bin/nshd: $(call golang.src,$(srcdir)) $(var)conf_file $(var)bindir
 	$(call golang.install,$(topsrcdir),nshd)
 
 $(outdir)/%.o: $(srcdir)/%.c $(var)CC $(var)CPPFLAGS $(var)CFLAGS
@@ -72,6 +72,7 @@ $(outdir)/%: $(srcdir)/%.in
 $(outdir)/nshd.service: $(var)user $(var)bindir
 $(outdir)/nshd.sysusers: $(var)user
 $(outdir)/scripts/common.rb: $(var)conf_file
+$(outdir)/src/nshd/main.go: $(var)conf_file $(var)bindir
 
 $(DESTDIR)$(bindir)/%: $(outdir)/bin/%
 	install -TDm755 $< $@
-- 
cgit v1.2.2