summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-07-12 22:40:49 +0000
committerntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-07-12 22:40:49 +0000
commitde6acb2d364493530f8d616169245e3a59a4a4d5 (patch)
treedbbdd56780f61d4e16ed37bd6a80e400f3b641e0 /src
parent2e832a399a10fc00253b342f8cde9c5b1062fa63 (diff)
downloadopenocd_libswd-de6acb2d364493530f8d616169245e3a59a4a4d5.tar.gz
openocd_libswd-de6acb2d364493530f8d616169245e3a59a4a4d5.tar.bz2
openocd_libswd-de6acb2d364493530f8d616169245e3a59a4a4d5.tar.xz
openocd_libswd-de6acb2d364493530f8d616169245e3a59a4a4d5.zip
- fix issue when building in separate build dir
- Thanks Duane Ellis git-svn-id: svn://svn.berlios.de/openocd/trunk@801 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 2f1a2211..502a63d5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -78,8 +78,6 @@ openocd_LDADD = $(top_builddir)/src/startup.o $(top_builddir)/src/xsvf/libxsvf.a
$(top_builddir)/src/pld/libpld.a \
$(FTDI2232LIB) $(FTD2XXLIB) $(MINGWLDADD) $(LIBUSB)
-
-
nobase_dist_pkglib_DATA = \
tcl/bitsbytes.tcl \
tcl/chip/atmel/at91/aic.tcl \
@@ -99,4 +97,6 @@ nobase_dist_pkglib_DATA = \
# Convert .tcl to object
$(top_builddir)/src/startup.o: $(top_srcdir)/src/startup.tcl
- ${OBJCOPY} -I binary -O ${OBJCOPY_FORMAT} -B ${OBJCOPY_ARCH} startup.tcl startup.o
+ abs_builddir=`cd $(top_builddir) && pwd` && \
+ cd $(top_srcdir)/src && \
+ ${OBJCOPY} -I binary -O ${OBJCOPY_FORMAT} -B ${OBJCOPY_ARCH} startup.tcl $$abs_builddir/src/startup.o