mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 06:01:15 +00:00
37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
|
From 8561789ba70ae5d741992b143ee288b8e11a5e2b Mon Sep 17 00:00:00 2001
|
||
|
|
From: joachim schiele <js@lastlog.de>
|
||
|
|
Date: Wed, 1 Mar 2017 15:15:22 +0100
|
||
|
|
Subject: [PATCH] fix to
|
||
|
|
https://github.com/arpa2/tlspool/issues/58#issuecomment-283333738
|
||
|
|
|
||
|
|
---
|
||
|
|
tool/Makefile | 5 ++---
|
||
|
|
1 file changed, 2 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/tool/Makefile b/tool/Makefile
|
||
|
|
index 9a15012..0f655e9 100644
|
||
|
|
--- a/tool/Makefile
|
||
|
|
+++ b/tool/Makefile
|
||
|
|
@@ -38,7 +38,6 @@ pgp11genkey_LIBS = $(P11KIT_LIBS) -lcrypto
|
||
|
|
|
||
|
|
configvar_CFLAGS = $(tlspool_CFLAGS)
|
||
|
|
configvar_LDFLAGS = $(tlspool_LDFLAGS)
|
||
|
|
-configvar_LIBS = $(tlspool_LIBS)
|
||
|
|
|
||
|
|
P11KIT_CFLAGS = $(shell pkg-config --cflags p11-kit-1)
|
||
|
|
P11KIT_LIBS = $(shell pkg-config --libs p11-kit-1)
|
||
|
|
@@ -96,8 +95,8 @@ have_db: have_db.c
|
||
|
|
pgp11_genkey: pgp11_genkey.c
|
||
|
|
gcc -std=gnu11 $(CFLAGS) $(pgp11genkey_CFLAGS) -o "$@" "$<" $(pgp11genkey_LIBS)
|
||
|
|
|
||
|
|
-configvar: configvar.c $(configvar_LIBS)
|
||
|
|
- gcc -std=gnu11 $(CFLAGS) $(configvar_CFLAGS) $(configvar_LDFLAGS) $(configvar_CFLAGS) -o "$@" "$<" $(configvar_LIBS)
|
||
|
|
+configvar: configvar.c
|
||
|
|
+ gcc -std=gnu11 $(CFLAGS) $(configvar_CFLAGS) $(configvar_LDFLAGS) $(configvar_CFLAGS) -o "$@" "$<"
|
||
|
|
|
||
|
|
$(tlspool_LIBS):
|
||
|
|
$(MAKE) -C ../lib `basename $(tlspool_LIBS)`
|
||
|
|
--
|
||
|
|
2.12.0
|
||
|
|
|