X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=Makefile.am;h=5227cc3ecb17f86db9b5881368317ebc7c9046c1;hp=c265331169b2512880e0bc15db5a4a01500d48fd;hb=3d14e7c9ac0155c0438b46dee267e3e16a6b8e3a;hpb=03d6d746b742fb21ca22086ba6b72943a845ecc9

diff --git a/Makefile.am b/Makefile.am
index c265331..5227cc3 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,14 @@ ChangeLog:
 	git --git-dir $(top_srcdir)/.git log > ChangeLog || touch ChangeLog
 
 dist-hook: ChangeLog
+	$(MKDIR_P) $(distdir)/tools
+	cp tools/install-decoders $(distdir)/tools
+	$(MKDIR_P) $(distdir)/decoders
+	tools/install-decoders -o $(distdir)/decoders
 
 install-decoders:
-	$(MKDIR_P) $(DECODERS_DIR)
-	tools/install-decoders -o $(DECODERS_DIR)
+	$(MKDIR_P) $(DESTDIR)$(DECODERS_DIR)
+	tools/install-decoders -o $(DESTDIR)$(DECODERS_DIR)
 
 install-data-hook: install-decoders