poke-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[COMMITTED] Move nodelist from <poke_infodir> to <poke_datadir>


From: John Darrington
Subject: [COMMITTED] Move nodelist from <poke_infodir> to <poke_datadir>
Date: Sat, 14 Mar 2020 07:00:10 +0100

This conforms better to GNU recommendations, will hopefully fix some
issues which packagers have been complaining about.
---
 ChangeLog       | 8 ++++++++
 doc/Makefile.am | 7 +++++--
 src/pk-misc.c   | 2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index da6f5f4c..b65de011 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2020-03-14  John Darrington <address@hidden>
+
+       * doc/Makefile.am (pkgdata_DATA): New variable.
+       * doc/Makefile.am (INFO_DEPS): Remove nodelist.
+       * doc/Makefile.am (nodelist): Move to $(top_srcdir)/src,
+       * src/pk-misc.c (doc_completion_dunction): Expect nodelist
+       in poke_datadir instead of poke_infodir.
+
 2020-03-10  Jose E. Marchesi  <address@hidden>
 
        * src/pkl-ast.c (pkl_ast_type_defval): Add missing locations to
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 58d88148..ba6a16fb 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -23,7 +23,10 @@ poke_TEXINFOS = fdl.texi
 # work around some limitations of readline.
 # Look for the macro SPACE_SUBSTITUTE in pk-repl.c to see how this
 # is used.
-$(srcdir)/nodelist: $(srcdir)/poke.info
+$(top_srcdir)/src/nodelist: $(srcdir)/poke.info
+       chmod u+w ${dir $@}
        $(SED) -n -e 's/^\* \([^:]*\)::.*/\1/p' $< | $(SED) -e 's| |/|g' > $@
 
-INFO_DEPS = $(srcdir)/nodelist $(srcdir)/poke.info
+INFO_DEPS = $(srcdir)/poke.info
+
+pkgdata_DATA = $(top_srcdir)/src/nodelist
diff --git a/src/pk-misc.c b/src/pk-misc.c
index dec45bea..d3cfadb2 100644
--- a/src/pk-misc.c
+++ b/src/pk-misc.c
@@ -164,7 +164,7 @@ doc_completion_function (const char *x, int state)
     {
       int n_nodes = 0;
       char nlfile[256];
-      snprintf (nlfile, 256, "%s/nodelist", poke_infodir);
+      snprintf (nlfile, 256, "%s/nodelist", poke_datadir);
       FILE *fp = fopen (nlfile, "r");
       if (fp == NULL)
        return NULL;
-- 
2.20.1




reply via email to

[Prev in Thread] Current Thread [Next in Thread]