49 lines
1.6 KiB
Text
49 lines
1.6 KiB
Text
$NetBSD: patch-aa,v 1.8 2007/09/06 19:15:10 jlam Exp $
|
|
|
|
--- Makefile.in.orig 2007-08-08 11:39:35.000000000 -0400
|
|
+++ Makefile.in
|
|
@@ -62,6 +62,7 @@ prefix=@prefix@
|
|
exec_prefix=${prefix}
|
|
bindir=${exec_prefix}/bin
|
|
sbindir=${exec_prefix}/sbin
|
|
+sysconfdir=@sysconfdir@
|
|
|
|
CC=@CC@
|
|
AR=@AR@
|
|
@@ -85,6 +86,8 @@ ifneq (,$(strip $(foreach prog, $(PROGRA
|
|
CFLAGS+= -DDROPBEAR_CLIENT
|
|
endif
|
|
|
|
+CFLAGS+=-DDSS_PRIV_FILENAME=\"$(sysconfdir)/dropbear/dropbear_dss_host_key\"
|
|
+CFLAGS+=-DRSA_PRIV_FILENAME=\"$(sysconfdir)/dropbear/dropbear_rsa_host_key\"
|
|
|
|
# these are exported so that libtomcrypt's makefile will use them
|
|
export CC
|
|
@@ -137,14 +140,14 @@ insmulti%: dropbearmulti
|
|
inst_dropbear: dropbear
|
|
$(INSTALL) -d -m 755 $(DESTDIR)$(sbindir)
|
|
$(INSTALL) -m 755 dropbear$(EXEEXT) $(DESTDIR)$(sbindir)
|
|
- -chown root $(DESTDIR)$(sbindir)/dropbear$(EXEEXT)
|
|
- -chgrp 0 $(DESTDIR)$(sbindir)/dropbear$(EXEEXT)
|
|
+ -chown ${ROOT_USER} $(DESTDIR)$(sbindir)/dropbear$(EXEEXT)
|
|
+ -chgrp ${ROOT_GROUP} $(DESTDIR)$(sbindir)/dropbear$(EXEEXT)
|
|
|
|
inst_%: $*
|
|
$(INSTALL) -d -m 755 $(DESTDIR)$(bindir)
|
|
$(INSTALL) -m 755 $*$(EXEEXT) $(DESTDIR)$(bindir)
|
|
- -chown root $(DESTDIR)$(bindir)/$*$(EXEEXT)
|
|
- -chgrp 0 $(DESTDIR)$(bindir)/$*$(EXEEXT)
|
|
+ -chown ${ROOT_USER} $(DESTDIR)$(bindir)/$*$(EXEEXT)
|
|
+ -chgrp ${ROOT_GROUP} $(DESTDIR)$(bindir)/$*$(EXEEXT)
|
|
|
|
|
|
# for some reason the rule further down doesn't like $($@objs) as a prereq.
|
|
@@ -181,7 +184,7 @@ link%:
|
|
-ln -s dropbearmulti$(EXEEXT) $*$(EXEEXT)
|
|
|
|
$(LTC): options.h
|
|
- cd libtomcrypt && $(MAKE) clean && $(MAKE)
|
|
+ cd libtomcrypt && $(MAKE)
|
|
|
|
$(LTM): options.h
|
|
cd libtommath && $(MAKE)
|