Patch from Melchior Franz:

[simgear.git] / simgear / serial / Makefile.am

diff --git a/simgear/serial/Makefile.am b/simgear/serial/Makefile.am
index 7ef69a90d6425576545457d800c029930427343a..7536cce8b65834ad9412eee43cb5e2407f7553f8 100644 (file)
--- a/simgear/serial/Makefile.am
+++ b/simgear/serial/Makefile.am
@@ -1,3 +1,5 @@
+includedir = @includedir@/serial
+
 noinst_PROGRAMS = testserial
 
 lib_LIBRARIES = libsgserial.a
@@ -9,7 +11,11 @@ libsgserial_a_SOURCES = serial.cxx
 testserial_SOURCES = testserial.cxx
 
 testserial_LDADD = \
-       $(top_builddir)/src/serial/libsgserial.a \
-       $(top_builddir)/src/debug/libsgdebug.a
+       $(top_builddir)/simgear/serial/libsgserial.a \
+       $(top_builddir)/simgear/debug/libsgdebug.a
 
-INCLUDES += -I$(top_builddir)/src
+if OLD_AUTOMAKE
+INCLUDES += -I$(top_srcdir)
+else
+INCLUDES = -I$(top_srcdir)
+endif