[PATCH] enable build of docs

0 views
Skip to first unread message

Daniel Kahn Gillmor

unread,
Jul 12, 2015, 4:10:51 PM7/12/15
to libpsl development
Without this change, after ./autogen.sh, ./configure --enable-gtk-doc
results in:

config.status: error: cannot find input file: `docs/libpsl/Makefile.in'
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 7fc1491..b5dcee8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -253,7 +253,7 @@ AC_CONFIG_FILES([Makefile
src/Makefile
tools/Makefile
po/Makefile.in
- ${docdir_makefile}
+ docs/libpsl/Makefile
${docdir_version_xml}
data/Makefile
tests/Makefile
--
2.1.4

Tim Rühsen

unread,
Jul 12, 2015, 4:49:06 PM7/12/15
to libps...@googlegroups.com, Daniel Kahn Gillmor
Hi Daniel,

thanks for pointing out !

I just read a few days ago that variables don't work reliable with
AC_CONFIG_FILES.

A hardcoded line like
> + docs/libpsl/Makefile

does not work either in each case (e.g. when not having gtk-doc utils).

I just pushed a fix, the release will come in a few days.

Tim
signature.asc

Daniel Kahn Gillmor

unread,
Jul 12, 2015, 5:53:17 PM7/12/15
to Tim Rühsen, libps...@googlegroups.com
Hi Tim--

On Sun 2015-07-12 16:48:59 -0400, Tim Rühsen wrote:
> I just read a few days ago that variables don't work reliable with
> AC_CONFIG_FILES.
>
> A hardcoded line like
>> + docs/libpsl/Makefile
>
> does not work either in each case (e.g. when not having gtk-doc utils).

hm, right, i was just patching it to make it build on debian, where we
can be sure that we have gtk-doc utils during package build time. Your
fix should probably be cleaner than that.

> I just pushed a fix, the release will come in a few days.

great, thanks!

I've just uploaded 0.7.1-1 (plus these two changes and a bit of
packaging updates and cleanup) to debian. you can see the edits (plus a
tag for 0.7.1-1) on the debian branch at https://github.com/dkg/libpsl.

I notice that you've updated effective_tld_names.dat in the repo
recently, but you should be aware that the upstream file is now called
public_suffix_list.dat (i'm maintaining effective_tld_names.dat as a
symlink in debian right now), and its canonical upstream is managed at
https://github.com/publicsuffix/list.

If you update to that source today, please be aware of the current
incompatibility between the tests and the authoritative file:
https://github.com/publicsuffix/list/pull/14

All the best,

--dkg

Tim Rühsen

unread,
Jul 14, 2015, 10:30:27 AM7/14/15
to libps...@googlegroups.com, Daniel Kahn Gillmor
Hi Daniel,

FYI, just merged your commits from branch 'debian' (Thanks !).

In branch 'develop' I removed the data directory and add a git submodule for
https://github.com/publicsuffix/list. To not carry a (redundant) copy of
public_suffix_list.dat and test_psl.txt.

I am goind to remove psl_builtin_compile_time() in the next release. I don't
see any real benefit from this function at all.

Due to near vacation I'll plan the next release for early August.

Regards, Tim
signature.asc
Reply all
Reply to author
Forward
0 new messages