Skip to content

Commit 488d418

Browse files
committed
Fix out-of-tree build
1 parent 30959bd commit 488d418

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

configure.ac

+8-4
Original file line numberDiff line numberDiff line change
@@ -349,18 +349,22 @@ AS_IF([test -z "$MD5PROG"], [AC_CHECK_PROG([MD5PROG], [md5], [md5 -r])], [])
349349
AS_IF([test -z "$MD5PROG"], [AC_MSG_WARN([md5 hashing program not found, some tests will be skipped])], [])
350350

351351
# List test files
352+
cur_dir=`pwd`
353+
cd "$srcdir"/tests
354+
352355
CR=$'\n'
353-
for f in tests/samples/*.{mobi,fail}
356+
for sample_path in samples/*.{mobi,fail}
354357
do
355-
PASSLIST="${PASSLIST} ${f#*/} \\${CR}"
358+
PASSLIST="${PASSLIST} ${sample_path} \\${CR}"
356359
done
357360
AC_SUBST([PASSLIST])
358-
for f in tests/samples/*.fail
361+
for sample_path in samples/*.fail
359362
do
360-
FAILLIST="${FAILLIST} ${f#*/} \\${CR}"
363+
FAILLIST="${FAILLIST} ${sample_path} \\${CR}"
361364
done
362365
AC_SUBST([FAILLIST])
363366

367+
cd $cur_dir
364368

365369
AC_CONFIG_FILES([Makefile])
366370
AC_CONFIG_FILES([libmobi.pc])

tools/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# this lists the binaries to produce, the (non-PHONY, binary) targets in
44
# the previous manual Makefile
5-
AM_CPPFLAGS = -I$(top_builddir)/src
5+
AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src
66

77
bin_PROGRAMS = mobitool mobimeta
88
man_MANS = mobitool.1 mobimeta.1

0 commit comments

Comments
 (0)