|
@@ -1,51 +0,0 @@
|
|
|
-From a63288c4d203850110a5a72d27fa0d7202ceadbc Mon Sep 17 00:00:00 2001
|
|
|
-From: Andrej Valek <andrej.valek@siemens.com>
|
|
|
-Date: Tue, 10 Apr 2018 12:30:09 +0200
|
|
|
-Subject: [PATCH] fix localoptions.h searching in out of tree building
|
|
|
-
|
|
|
-When dropbear is build out of tree, is necessary to search for localoptions
|
|
|
-header file is source directory.
|
|
|
-
|
|
|
-Upstream-Status: Submitted [https://github.com/mkj/dropbear/pull/62]
|
|
|
-
|
|
|
-Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
|
|
|
----
|
|
|
- Makefile.in | 8 ++++----
|
|
|
- 1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
-
|
|
|
-diff --git a/Makefile.in b/Makefile.in
|
|
|
-index e7d52a2..a615896 100644
|
|
|
---- a/Makefile.in
|
|
|
-+++ b/Makefile.in
|
|
|
-@@ -17,6 +17,9 @@ STATIC_LTM=libtommath/libtommath.a
|
|
|
-
|
|
|
- LIBTOM_LIBS=@LIBTOM_LIBS@
|
|
|
-
|
|
|
-+VPATH=@srcdir@
|
|
|
-+srcdir=@srcdir@
|
|
|
-+
|
|
|
- ifeq (@BUNDLED_LIBTOM@, 1)
|
|
|
- LIBTOM_DEPS=$(STATIC_LTC) $(STATIC_LTM)
|
|
|
- LIBTOM_CLEAN=ltc-clean ltm-clean
|
|
|
-@@ -25,7 +28,7 @@ LIBTOM_LIBS=$(STATIC_LTC) $(STATIC_LTM)
|
|
|
- endif
|
|
|
-
|
|
|
- OPTION_HEADERS = default_options_guard.h sysoptions.h
|
|
|
--ifneq ($(wildcard localoptions.h),)
|
|
|
-+ifneq ($(wildcard $(srcdir)/localoptions.h),)
|
|
|
- CFLAGS+=-DLOCALOPTIONS_H_EXISTS
|
|
|
- OPTION_HEADERS += localoptions.h
|
|
|
- endif
|
|
|
-@@ -65,9 +68,6 @@ dropbearkeyobjs=$(COMMONOBJS) $(KEYOBJS)
|
|
|
- dropbearconvertobjs=$(COMMONOBJS) $(CONVERTOBJS)
|
|
|
- scpobjs=$(SCPOBJS)
|
|
|
-
|
|
|
--VPATH=@srcdir@
|
|
|
--srcdir=@srcdir@
|
|
|
--
|
|
|
- prefix=@prefix@
|
|
|
- exec_prefix=@exec_prefix@
|
|
|
- datarootdir = @datarootdir@
|
|
|
---
|
|
|
-2.11.0
|
|
|
-
|