From: Ronnie Sahlberg <ronniesahlberg@gmail.com>
Date: Wed, 8 Jan 2014 14:32:07 +0000 (-0800)
Subject: Merge pull request #45 from maksbotan/master
X-Git-Tag: upstream/1.9.6^2~136
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=2d22ee96622e0913cbc9c9e66046dd6d1fdfdac4;hp=7bda8bad0057c258f90952f67a42f6dd95b860de;p=deb_libnfs.git

Merge pull request #45 from maksbotan/master

Adjust Makefile.am's to support out-of-source builds
---

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 32b0e55..39f5a17 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -3,10 +3,10 @@ noinst_PROGRAMS = nfsclient-async nfsclient-raw nfsclient-sync nfsclient-bcast n
 AM_CPPFLAGS = \
 	-I$(abs_top_srcdir)/include \
 	-I$(abs_top_srcdir)/include/nfsc \
-	-I../mount \
-	-I../nfs \
-	-I../rquota \
-	-I../portmap \
+	-I$(abs_top_srcdir)/mount \
+	-I$(abs_top_srcdir)/nfs \
+	-I$(abs_top_srcdir)/rquota \
+	-I$(abs_top_srcdir)/portmap \
 	"-D_U_=__attribute__((unused))"
 
 AM_LDFLAGS = ../lib/.libs/libnfs.la -lpopt
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 97beb83..de4fc58 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2,12 +2,12 @@ lib_LTLIBRARIES = libnfs.la
 
 libnfs_la_CPPFLAGS = -I$(abs_top_srcdir)/include \
 		     -I$(abs_top_srcdir)/include/nfsc \
-		     -I../mount \
-		     -I../nfs \
-		     -I../nlm \
-		     -I../nsm \
-		     -I../portmap \
-		     -I../rquota \
+		     -I$(abs_top_srcdir)/mount \
+		     -I$(abs_top_srcdir)/nfs \
+		     -I$(abs_top_srcdir)/nlm \
+		     -I$(abs_top_srcdir)/nsm \
+		     -I$(abs_top_srcdir)/portmap \
+		     -I$(abs_top_srcdir)/rquota \
 		     "-D_U_=__attribute__((unused))"
 
 libnfs_la_SOURCES = \