aboutsummaryrefslogtreecommitdiff
blob: f13f07a4c81fa4aabdf075a446bb29caa882a257 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
From 8f3e4f4d6df9f813572051e12e974b35c26a1743 Mon Sep 17 00:00:00 2001
From: Lars Wendler <polynomial-c@gentoo.org>
Date: Mon, 28 May 2018 12:13:10 +0200
Subject: [PATCH] Fix undefined references and bad include when build with
 junction support

---
 support/junction/Makefile.am | 2 +-
 utils/nfsref/Makefile.am     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/support/junction/Makefile.am b/support/junction/Makefile.am
index 97e7426..89cb532 100644
--- a/support/junction/Makefile.am
+++ b/support/junction/Makefile.am
@@ -31,4 +31,4 @@ libjunction_la_SOURCES	= display.c export-cache.c junction.c \
 
 MAINTAINERCLEANFILES	= Makefile.in
 
-AM_CPPFLAGS		= -I. -I../include -I/usr/include/libxml2
+AM_CPPFLAGS		= -I. -I../include -I/usr/include/libxml2 @TIRPC_CFLAGS@
diff --git a/utils/nfsref/Makefile.am b/utils/nfsref/Makefile.am
index 2b2bb53..a652b03 100644
--- a/utils/nfsref/Makefile.am
+++ b/utils/nfsref/Makefile.am
@@ -27,13 +27,13 @@ noinst_HEADERS		= nfsref.h
 
 sbin_PROGRAMS		= nfsref
 nfsref_SOURCES		= add.c lookup.c nfsref.c remove.c
-LDADD			= $(LIBXML2) $(LIBCAP) \
-			  ../../support/nfs/libnfs.la \
+LIBS			+= $(LIBXML2) $(LIBCAP)
+LDADD			=  ../../support/nfs/libnfs.la \
 			  ../../support/junction/libjunction.la
 
 man8_MANS		= nfsref.man
 
 MAINTAINERCLEANFILES	= Makefile.in
 
-AM_CPPFLAGS		= -I. -I../../support/include
+AM_CPPFLAGS		= -I. -I../../support/include @TIRPC_CFLAGS@
 ##AM_LDFLAGS		= -Wl,--as-needed
-- 
2.17.0