| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From e198f0a87660a048164ca0e16d18517d0aee846e Mon Sep 17 00:00:00 2001 |
| 2 | From: Andre McCurdy <armccurdy@gmail.com> |
| 3 | Date: Tue, 9 Jun 2015 12:20:45 -0700 |
| 4 | Subject: [PATCH] Fix builds when using separate source and build directories. |
| 5 | |
| 6 | Upstream-Status: Pending |
| 7 | |
| 8 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> |
| 9 | --- |
| 10 | configure.ac | 8 ++++---- |
| 11 | ixml/Makefile.am | 2 +- |
| 12 | threadutil/Makefile.am | 2 +- |
| 13 | 3 files changed, 6 insertions(+), 6 deletions(-) |
| 14 | |
| 15 | diff --git a/configure.ac b/configure.ac |
| 16 | index e2c3f47..11d5e22 100644 |
| 17 | --- a/configure.ac |
| 18 | +++ b/configure.ac |
| 19 | @@ -714,8 +714,8 @@ AC_OUTPUT |
| 20 | # |
| 21 | # Files copied for windows compilation. |
| 22 | # |
| 23 | -echo "configure: copying \"autoconfig.h\" to \"build/inc/autoconfig.h\"" |
| 24 | -cp autoconfig.h build/inc/autoconfig.h |
| 25 | -echo "configure: copying \"upnp/inc/upnpconfig.h\" to \"build/inc/upnpconfig.h\"" |
| 26 | -cp upnp/inc/upnpconfig.h build/inc/upnpconfig.h |
| 27 | +echo "configure: copying \"autoconfig.h\" to \"\$srcdir/build/inc/autoconfig.h\"" |
| 28 | +cp autoconfig.h $srcdir/build/inc/autoconfig.h |
| 29 | +echo "configure: copying \"upnp/inc/upnpconfig.h\" to \"\$srcdir/build/inc/upnpconfig.h\"" |
| 30 | +cp upnp/inc/upnpconfig.h $srcdir/build/inc/upnpconfig.h |
| 31 | |
| 32 | diff --git a/ixml/Makefile.am b/ixml/Makefile.am |
| 33 | index 49da766..0e9ab2c 100644 |
| 34 | --- a/ixml/Makefile.am |
| 35 | +++ b/ixml/Makefile.am |
| 36 | @@ -7,7 +7,7 @@ |
| 37 | |
| 38 | SUBDIRS = doc |
| 39 | |
| 40 | -AM_CPPFLAGS = -I$(srcdir)/inc -I$(srcdir)/src/inc |
| 41 | +AM_CPPFLAGS = -I$(top_srcdir)/upnp/inc -I$(srcdir)/inc -I$(srcdir)/src/inc |
| 42 | AM_CFLAGS = |
| 43 | |
| 44 | LDADD = libixml.la |
| 45 | diff --git a/threadutil/Makefile.am b/threadutil/Makefile.am |
| 46 | index a4ed325..42d0726 100644 |
| 47 | --- a/threadutil/Makefile.am |
| 48 | +++ b/threadutil/Makefile.am |
| 49 | @@ -4,7 +4,7 @@ |
| 50 | # (C) Copyright 2005 Remi Turboult <r3mi@users.sourceforge.net> |
| 51 | # |
| 52 | |
| 53 | -AM_CPPFLAGS = -I$(srcdir)/inc -I$(srcdir)/src/inc |
| 54 | +AM_CPPFLAGS = -I$(top_srcdir)/upnp/inc -I$(srcdir)/inc -I$(srcdir)/src/inc |
| 55 | |
| 56 | if ENABLE_DEBUG |
| 57 | AM_CPPFLAGS += -DDEBUG -DSTATS |
| 58 | -- |
| 59 | 1.9.1 |
| 60 | |