diff options
author | Mark H Weaver <mhw@netris.org> | 2014-09-11 18:26:28 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2014-09-11 18:26:28 -0400 |
commit | 66ea98e321e93b0806f6870d77dd4c00e7e720c0 (patch) | |
tree | 21778401485e3b8683bbc6a31769233c059683b1 /gnu/packages/patches/ots-no-include-missing-file.patch | |
parent | da5538ef44bfa74d3e435f9f557374eabba5dc1e (diff) | |
parent | 5dae0186dea1e72e73bf223161620cfeddef5a63 (diff) | |
download | guix-66ea98e321e93b0806f6870d77dd4c00e7e720c0.tar guix-66ea98e321e93b0806f6870d77dd4c00e7e720c0.tar.gz |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/image.scm
Diffstat (limited to 'gnu/packages/patches/ots-no-include-missing-file.patch')
-rw-r--r-- | gnu/packages/patches/ots-no-include-missing-file.patch | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/gnu/packages/patches/ots-no-include-missing-file.patch b/gnu/packages/patches/ots-no-include-missing-file.patch new file mode 100644 index 0000000000..c23c7c36a1 --- /dev/null +++ b/gnu/packages/patches/ots-no-include-missing-file.patch @@ -0,0 +1,14 @@ +The file $(top_srcdir)/gtk-doc.make doesn't exist, so don't include it. + +--- a/doc/Makefile.in 2007-04-08 20:17:25.000000000 +0200 ++++ b/doc/Makefile.in 2014-09-06 23:19:41.413397662 +0200 +@@ -240,9 +240,6 @@ + distclean-generic clean-generic maintainer-clean-generic clean \ + mostlyclean distclean maintainer-clean + +- +-include $(top_srcdir)/gtk-doc.make +- + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: |