X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=Makefile.am;h=b7136a01fb13bfb1f664e2df747a67acfb23dfdc;hp=9a0a8924baf1fec14048ff49bbd94365d6bacbd4;hb=4e3b276aac6d42722fe8a90e8c4ea74bf59fdb37;hpb=a90eeee1f0af5213f8e88788d0d2d715fad1d4c6

diff --git a/Makefile.am b/Makefile.am
index 9a0a892..b7136a0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@
 
 ACLOCAL_AMFLAGS = -I autostuff
 
-SUBDIRS = contrib tests
+SUBDIRS = . contrib tests
 
 lib_LTLIBRARIES = libsigrokdecode.la
 
@@ -39,7 +39,7 @@ libsigrokdecode_la_SOURCES = \
 	version.c
 
 libsigrokdecode_la_CPPFLAGS = $(CPPFLAGS_PYTHON) \
-			      -DDECODERS_DIR='"$(DECODERS_DIR)"'
+	-DDECODERS_DIR='"$(DECODERS_DIR)"'
 libsigrokdecode_la_LDFLAGS = $(SRD_LIB_LDFLAGS) $(LDFLAGS_PYTHON)
 
 library_includedir = $(includedir)/libsigrokdecode
@@ -58,10 +58,16 @@ ChangeLog:
 	git --git-dir $(top_srcdir)/.git log > ChangeLog || touch ChangeLog
 
 dist-hook: ChangeLog
+	$(MKDIR_P) $(distdir)/tools
+	cp ${top_srcdir}/tools/install-decoders $(distdir)/tools
+	$(MKDIR_P) $(distdir)/decoders
+	${top_srcdir}/tools/install-decoders -i ${top_srcdir}/decoders \
+		-o $(distdir)/decoders
 
 install-decoders:
 	$(MKDIR_P) $(DESTDIR)$(DECODERS_DIR)
-	tools/install-decoders -o $(DESTDIR)$(DECODERS_DIR)
+	${top_srcdir}/tools/install-decoders -i ${top_srcdir}/decoders \
+		-o $(DESTDIR)$(DECODERS_DIR)
 
 install-data-hook: install-decoders