On 2013/04/18 14:31, Brian Callahan wrote:
> - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \
> +- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \
> - $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \
> -+ $(INSTALL_DATA) $$files "$(PREFIX)/share/examples/dillo/"; \
> ++ echo " $(INSTALL_DATA) $$files '${PREFIX}/share/examples/dillo/'"; \
> ++ $(INSTALL_DATA) $$files "${PREFIX}/share/examples/dillo/" || exit
> $$?; \
This type of patch is usually better handled by setting something like,
FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples/dillo/
so with something like that you should be able to get rid of
all these Makefile patches.
> +--- src/IO/dpi.c.orig Thu Apr 18 12:32:17 2013
> ++++ src/IO/dpi.c Thu Apr 18 12:33:16 2013
> +@@ -350,12 +350,12 @@ static int Dpi_start_dpid(void)
> /* This is the child process. Execute the command. */
> char *path1 = dStrconcat(dGethomedir(), "/.dillo/dpid", NULL);
> - Dpi_close_fd(st_pipe[0]);
> + dClose(st_pipe[0]);
> - if (execl(path1, "dpid", (char*)NULL) == -1) {
> -+ if (execl(path1, "dpid", (void *)NULL) == -1) {
> ++ if (execl(path1, "dpid", (void*)NULL) == -1) {
> dFree(path1);
> path1 = dStrconcat(DILLO_BINDIR, "dpid", NULL);
> - if (execl(path1, "dpid", (char*)NULL) == -1) {
> -+ if (execl(path1, "dpid", (void *)NULL) == -1) {
> ++ if (execl(path1, "dpid", (void*)NULL) == -1) {
> dFree(path1);
> - if (execlp("dpid", "dpid", (char*)NULL) == -1) {
> -+ if (execlp("dpid", "dpid", (void *)NULL) == -1) {
> ++ if (execlp("dpid", "dpid", (void*)NULL) == -1) {
> MSG("Dpi_start_dpid (child): %s\n", dStrerror(errno));
> if (Dpi_blocking_write(st_pipe[1], "ERROR", 5) == -1) {
> MSG("Dpi_start_dpid (child): can't write to pipe.\n");
This patch doesn't seem necessary?
> -@@ -34,7 +34,7 @@
> +--- src/dns.c.orig Sun Jan 27 12:26:38 2013
> ++++ src/dns.c Thu Apr 18 12:25:04 2013
> +@@ -17,7 +17,7 @@
> /*
> * Uncomment the following line for debugging or gprof profiling.
> */
> -/* #undef D_DNS_THREADED */
> +#undef D_DNS_THREADED
>
>From a quick test it seems to work without this too.
> share/examples/dillo/
> share/examples/dillo/dillorc
> @sample ${SYSCONFDIR}/dillorc
> +share/examples/dillo/domainrc
missing @sample
> share/examples/dillo/dpidrc
> @sample ${SYSCONFDIR}/dpidrc
> share/examples/dillo/keysrc
