summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2012-08-11 21:57:17 +0200
committerLudovic Courtès <ludo@gnu.org>2012-08-11 21:57:17 +0200
commit0dea12ff8d7b210d735b5d555c67008f40983f82 (patch)
tree6f5e05ad184759bd92e74cde21c5df1396937d92 /pkgs
parentcb76c03216fbc042bad2a603e0bcdd7d74ffa86d (diff)
downloadnixlib-0dea12ff8d7b210d735b5d555c67008f40983f82.tar
nixlib-0dea12ff8d7b210d735b5d555c67008f40983f82.tar.gz
nixlib-0dea12ff8d7b210d735b5d555c67008f40983f82.tar.bz2
nixlib-0dea12ff8d7b210d735b5d555c67008f40983f82.tar.lz
nixlib-0dea12ff8d7b210d735b5d555c67008f40983f82.tar.xz
nixlib-0dea12ff8d7b210d735b5d555c67008f40983f82.tar.zst
nixlib-0dea12ff8d7b210d735b5d555c67008f40983f82.zip
gnutls: FreeBSD: patch Makefile.in, not Makefile.am
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/gnutls/guile-gnulib-includes.patch16
1 files changed, 7 insertions, 9 deletions
diff --git a/pkgs/development/libraries/gnutls/guile-gnulib-includes.patch b/pkgs/development/libraries/gnutls/guile-gnulib-includes.patch
index 3e7f46e7699a..1624d1f7ab9d 100644
--- a/pkgs/development/libraries/gnutls/guile-gnulib-includes.patch
+++ b/pkgs/development/libraries/gnutls/guile-gnulib-includes.patch
@@ -4,16 +4,14 @@ Date:   Thu Aug 9 15:24:11 2012 +0200
 
     Add gnulib -I's to guile-snarf command.
 
-diff --git a/guile/src/Makefile.am b/guile/src/Makefile.am
-index 7b55500..f52eee9 100644
---- a/guile/src/Makefile.am
-+++ b/guile/src/Makefile.am
-@@ -95,7 +95,7 @@ priorities.i.c: $(srcdir)/make-session-priorities.scm
+--- gnutls-3.0.22/guile/src/Makefile.in	2012-08-04 20:52:39.000000000 +0200
++++ gnutls-3.0.22/guile/src/Makefile.in	2012-08-11 21:55:20.000000000 +0200
+@@ -1564,7 +1564,7 @@ AM_CPPFLAGS = \
  # `$(GUILE_CFLAGS)' may contain a series of `-I' switches so it must be
  # included here, even though we'd really want `$(GUILE_CPPFLAGS)'.
  snarfcppopts = $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--              $(CFLAGS) $(AM_CFLAGS) $(GUILE_CFLAGS)
-+              $(CFLAGS) $(guile_gnutls_v_2_la_CFLAGS)
+-	       $(CFLAGS) $(AM_CFLAGS) $(GUILE_CFLAGS)
++	       $(CFLAGS) $(guile_gnutls_v_2_la_CFLAGS)
  
- .c.x: $(BUILT_SOURCES)
-        $(guile_snarf) -o $@ $< $(snarfcppopts)
+ all: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) all-am