# HG changeset patch # User Florian Pose # Date 1233769026 0 # Node ID e2fb03ca54ef0f5765e36d75d07db549c1db627d # Parent 22b1de4c74e4ff068f1e1fe16ed31610116116b4 builddir and srcdir, tbc. diff -r 22b1de4c74e4 -r e2fb03ca54ef examples/user/Makefile.am --- a/examples/user/Makefile.am Wed Feb 04 17:06:14 2009 +0000 +++ b/examples/user/Makefile.am Wed Feb 04 17:37:06 2009 +0000 @@ -29,7 +29,7 @@ noinst_PROGRAMS = ec_user_example ec_user_example_SOURCES = main.c -ec_user_example_CFLAGS = -I$(srcdir)/../../include -ec_user_example_LDFLAGS = -L$(srcdir)/../../lib/.libs -lethercat +ec_user_example_CFLAGS = -I$(top_srcdir)/include +ec_user_example_LDFLAGS = -L$(top_builddir)/lib/.libs -lethercat #------------------------------------------------------------------------------ diff -r 22b1de4c74e4 -r e2fb03ca54ef tool/Makefile.am --- a/tool/Makefile.am Wed Feb 04 17:06:14 2009 +0000 +++ b/tool/Makefile.am Wed Feb 04 17:37:06 2009 +0000 @@ -83,12 +83,12 @@ SdoCommand.h \ sii_crc.h -REV = `if test -s $(srcdir)/../svnrevision; then \ - cat $(srcdir)/../svnrevision; \ +REV = `if test -s $(top_srcdir)/svnrevision; then \ + cat $(top_srcdir)/svnrevision; \ else \ svnversion $(srcdir)/.. 2>/dev/null || echo "unknown"; \ fi` -ethercat_CXXFLAGS = -I../master -Wall -DSVNREV=$(REV) +ethercat_CXXFLAGS = -I$(top_srcdir)/master -Wall -DSVNREV=$(REV) #------------------------------------------------------------------------------