]> granicus.if.org Git - recode/commitdiff
Fix make distcheck
authorReuben Thomas <rrt@sc3d.org>
Sat, 13 Jan 2018 22:25:25 +0000 (22:25 +0000)
committerReuben Thomas <rrt@sc3d.org>
Sun, 14 Jan 2018 20:45:31 +0000 (20:45 +0000)
tests/Makefile.am
tests/setup.py.in

index a75a65e9de159e162a213fb87b5e59351d0cad69..a7110838012240eed552715765535c4e66e5bc4c 100644 (file)
@@ -28,12 +28,13 @@ t30_dumps.py t30_quoted.py t40_african.py t40_combine.py t40_testdump.py \
 t40_utf7.py t40_utf8.py t50_methods.py t90_bigauto.py
 
 EXTRA_DIST = Recode.c Recode.pyx pytest common.py $(SUITE)
-CLEANFILES = Recode@shlibext@
+CLEANFILES = Recode@shlibext@ Recode.body.c
+DISTCLEANFILES = Recode.c
 
 PYTHON = python
 
 check-local: Recode@shlibext@
-       export LD_LIBRARY_PATH=$(top_srcdir)/src/@objdir@ && \
+       export LD_LIBRARY_PATH=$(top_builddir)/src/@objdir@ && \
        RECODE=$(top_builddir)/src/recode PYTHONPATH=.:$(srcdir) \
          $(PYTHON) $(srcdir)/pytest $(LIMIT) $(srcdir)/t*.py
 
@@ -44,6 +45,6 @@ Recode@shlibext@: Recode.c setup.py
 
 Recode.c: Recode.pyx Makefile
        rm -f Recode.c && \
-       cython -o Recode.body.c Recode.pyx && \
+       cython -o Recode.body.c $(srcdir)/Recode.pyx && \
        echo '#include "config.h"' > Recode.c && \
        cat Recode.body.c >> Recode.c
index 114d6c858e1e4c1adb01dbe0c828a44badf8b1ee..48f94641268b17ae01490d0e9f96ffd5106e1936 100644 (file)
@@ -19,8 +19,8 @@ try:
         Extension('Recode', ['Recode.c'],
                   include_dirs=[top_builddir, os.path.join(top_srcdir, 'src'),
                                 os.path.join(top_srcdir, 'lib')],
-                  library_dirs=[os.path.join(top_srcdir, 'src', '.libs'),
-                                os.path.join(top_srcdir, 'lib', '.libs')],
+                  library_dirs=[os.path.join(top_builddir, 'src', '.libs'),
+                                os.path.join(top_builddir, 'lib', '.libs')],
                   libraries=['recode', 'gnu'])
         ])