From f9ca13980468771aa8136e9e95845e591b6b2fed Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@redhat.com>
Date: Feb 26 2017 23:33:59 +0000
Subject: Fix 'make dist' in tools when builddir != srcdir


Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>

---

diff --git a/tests/tools/Makefile.am b/tests/tools/Makefile.am
index 9988b8c..d79c944 100644
--- a/tests/tools/Makefile.am
+++ b/tests/tools/Makefile.am
@@ -1,7 +1,7 @@
 AM_CFLAGS = $(TALLOC_CFLAGS) $(TEVENT_CFLAGS) $(DBUS_CFLAGS) $(KRB5_CFLAGS) \
 	    $(XMLRPC_CFLAGS) $(IDN_CFLAGS) $(UUID_CFLAGS) $(LDAP_CFLAGS) \
-	    $(POPT_CFLAGS) -I$(builddir)/../../src
-LDADD = libtools.a ../../src/libcm.a $(srcdir)/../../src/env-system.c \
+	    $(POPT_CFLAGS) -I$(builddir)/../../src -I$(srcdir)/../../src
+LDADD = libtools.a $(builddir)/../../src/libcm.a $(srcdir)/../../src/env-system.c \
 	libtools.a $(OPENSSL_LIBS) $(CERTMONGER_LIBS) $(KRB5_LIBS) $(IDN_LIBS) \
 	$(GMP_LIBS) $(UUID_LIBS) $(RESOLV_LIBS) $(POPT_LIBS) $(LTLIBICONV)
 
@@ -21,7 +21,7 @@ if HAVE_OPENSSL
 noinst_PROGRAMS += pk7parse pk7env scepgen pk7verify pk7decrypt
 endif
 
-libtools_a_SOURCES = ../../src/tm.h tm.c tools.h tools.c
+libtools_a_SOURCES = $(srcdir)/../../src/tm.h tm.c tools.h tools.c
 listnicks_CFLAGS = $(AM_CFLAGS) $(NSS_CFLAGS)
 
 payload_CFLAGS = $(AM_CFLAGS) $(NSS_CFLAGS)
@@ -29,10 +29,10 @@ checksig_CFLAGS = $(AM_CFLAGS) $(NSS_CFLAGS)
 addcinfo_CFLAGS = $(AM_CFLAGS) $(NSS_CFLAGS)
 
 dparse_CFLAGS = $(AM_CFLAGS) $(XML_CFLAGS)
-dparse_SOURCES = dparse.c ../../src/submit-d.c
+dparse_SOURCES = dparse.c $(srcdir)/../../src/submit-d.c
 dparse_LDADD = $(LDADD) $(XML_LIBS)
 
-citerate_SOURCES = citerate.c ../../src/store-gen.c
+citerate_SOURCES = citerate.c $(srcdir)/../../src/store-gen.c
 
-srv_SOURCES = srv.c ../../src/srvloc.c
+srv_SOURCES = srv.c $(srcdir)/../../src/srvloc.c
 srv_LDADD = $(LDADD)