From: Uwe Hermann <redacted>
Date: Sat, 15 Jan 2011 02:30:26 +0000 (+0100)
Subject: Only load decoders from $(datadir)/sigrok/decoders.
X-Git-Tag: libsigrokdecode-0.1.0~313
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=0895f56aa091fabc4761862f43020b53396ed9d5;p=libsigrokdecode.git

Only load decoders from $(datadir)/sigrok/decoders.

Drop convenience locations which were supposed to allow running
./cli/sigrok-cli in the build directory. That will not really work fine
due to some other reasons. We only support running sigrok-cli after an
installation (into /usr/local or /opt or $HOME/sigrokinst or whatever).
---

diff --git a/decode.c b/decode.c
index 3a1f63d..2cae1db 100644
--- a/decode.c
+++ b/decode.c
@@ -47,14 +47,11 @@ int sigrokdecode_init(void)
 	/* Py_Initialize() returns void and usually cannot fail. */
 	Py_Initialize();
 
-	/* Add some more search directories for convenience. */
+	/* Add search directory for the protocol decoders. */
 	/* FIXME: Check error code. */
 	/* FIXME: What happens if this function is called multiple times? */
-	PyRun_SimpleString(
-		"import sys;"
-		"sys.path.append('libsigrokdecode/decoders');"
-		"sys.path.append('" DECODERS_DIR "');"
-		);
+	PyRun_SimpleString("import sys;"
+			   "sys.path.append('" DECODERS_DIR "');");
 
 	if (!(dir = opendir(DECODERS_DIR)))
 		return SIGROKDECODE_ERR_DECODERS_DIR;