completed fix for srcdir

diff --git a/plugins/puredata/Makefile.am b/plugins/puredata/Makefile.am
index 5e593f7026c1f7c2565fff0176f0ec8eea1d55dd..23ebc2f1f2e39fff9e3a1ff474ae9079a0d40363 100644 (file)
--- a/plugins/puredata/Makefile.am
+++ b/plugins/puredata/Makefile.am
@@ -18,7 +18,7 @@ aubioonset__pd_linux_SOURCES = \
 
 pdincludedir = $(pddir)/src
 
-LIBTOOL=$(SHELL) ./libtoolkludge
+LIBTOOL=$(SHELL) $(srcdir)/libtoolkludge
 
 INCLUDES = -I$(top_srcdir) -I$(pdincludedir)
 

diff --git a/python/aubio/Makefile.am b/python/aubio/Makefile.am
index 466a1e3c5bf40277a6dbd04309b1a8cf6138d58f..5fe9c2130f9bcb3626d622c4b9646c6306fce091 100644 (file)
--- a/python/aubio/Makefile.am
+++ b/python/aubio/Makefile.am
@@ -10,7 +10,7 @@ all: _aubiowrapper.so
 # removed -Wall -Wmissing-prototypes -Wmissing-declarations 
 CFLAGS = -DJACK_SUPPORT -Werror -Wno-char-subscripts \
        -Wno-unknown-pragmas $(SWCFLAGS) \
-       -I$(srcdir)/../../src -I$(srcdir)/../../ext \
+       -I../../src -I$(srcdir)/../../src -I$(srcdir)/../../ext \
        -I/usr/include/python${PYTHON_VERSION} \
        -I${prefix}/include/python${PYTHON_VERSION} \
        -I/usr/include \
@@ -19,7 +19,7 @@ CFLAGS = -DJACK_SUPPORT -Werror -Wno-char-subscripts \
 LDFLAGS = $(SWLDFLAGS) -L../../ext/.libs -laubioext -L../../src/.libs -laubio
 
 aubio_wrap.c:
-       $(SWIG) -outdir . -o aubio_wrap.c -python ../../swig/aubio.i
+       $(SWIG) -outdir . -o aubio_wrap.c -python $(srcdir)/../../swig/aubio.i
 
 _aubiowrapper.so: aubio_wrap.c
        $(CC) $(CFLAGS) -c aubio_wrap.c