From 756bc0f4b7712231eaca4d4c3bea19d0d4c0ac92 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 4 Jul 2003 18:15:25 +0000 Subject: Dan Grayson pointed out that we set the CURL_CA_BUNDLE variable wrongly in the configure script. We set it differently now and generate the lib/ca-bundle.h file entirely. --- lib/Makefile.am | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'lib/Makefile.am') diff --git a/lib/Makefile.am b/lib/Makefile.am index ebec015d8..a12c00e18 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -69,16 +69,23 @@ memdebug.h inet_ntoa_r.h http_chunks.c http_chunks.h strtok.c strtok.h \ connect.c connect.h llist.c llist.h hash.c hash.h multi.c \ content_encoding.c content_encoding.h share.c share.h http_digest.c \ md5.c md5.h http_digest.h http_negotiate.c http_negotiate.h \ -http_ntlm.c http_ntlm.h +http_ntlm.c http_ntlm.h ca-bundle.h noinst_HEADERS = setup.h transfer.h +BUILT_SOURCES = $(srcdir)/getdate.c $(srcdir)/ca-bundle.h + # Say $(srcdir), so GNU make does not report an ambiguity with the .y.c rule. $(srcdir)/getdate.c: getdate.y cd $(srcdir) && \ $(YACC) $(YFLAGS) getdate.y; \ mv -f y.tab.c getdate.c +$(srcdir)/ca-bundle.h: Makefile.in Makefile + cd $(srcdir) && \ + echo "/* The file is generated automaticly */" > $@ + echo '#define CURL_CA_BUNDLE @CURL_CA_BUNDLE@' >> $@ + install-data-hook: @if test -n "@CURL_CA_BUNDLE@"; then \ $(mkinstalldirs) `dirname $(DESTDIR)@CURL_CA_BUNDLE@`; \ @@ -88,4 +95,4 @@ install-data-hook: # this hook is mainly for non-unix systems to build even if configure # isn't run dist-hook: - cp $(srcdir)/ca-bundle.h.in $(distdir)/ca-bundle.h + echo "/* ca bundle path set in here*/" > $(distdir)/ca-bundle.h -- cgit v1.2.3