comparison Makefile.in @ 835:4095b6d7c9fc ecc

Merge in changes from the past couple of releases
author Matt Johnston <matt@ucc.asn.au>
date Fri, 18 Oct 2013 21:38:01 +0800
parents 460410334267 93e04b9ff676
children b298bb438625 6c69e7df3621
comparison
equal deleted inserted replaced
807:75509065db53 835:4095b6d7c9fc
65 65
66 VPATH=@srcdir@ 66 VPATH=@srcdir@
67 srcdir=@srcdir@ 67 srcdir=@srcdir@
68 68
69 prefix=@prefix@ 69 prefix=@prefix@
70 exec_prefix=${prefix} 70 exec_prefix=@exec_prefix@
71 bindir=${exec_prefix}/bin 71 datarootdir = @datarootdir@
72 sbindir=${exec_prefix}/sbin 72 bindir=@bindir@
73 sbindir=@sbindir@
74 mandir=@mandir@
73 75
74 CC=@CC@ 76 CC=@CC@
75 AR=@AR@ 77 AR=@AR@
76 RANLIB=@RANLIB@ 78 RANLIB=@RANLIB@
77 STRIP=@STRIP@ 79 STRIP=@STRIP@
119 strip: $(TARGETS) 121 strip: $(TARGETS)
120 $(STRIP) $(addsuffix $(EXEEXT), $(TARGETS)) 122 $(STRIP) $(addsuffix $(EXEEXT), $(TARGETS))
121 123
122 install: $(addprefix inst_, $(TARGETS)) 124 install: $(addprefix inst_, $(TARGETS))
123 125
124 installdropbearmulti: insdbmulti $(addprefix insmulti, $(PROGRAMS))
125
126 insdbmulti: dropbearmulti
127 $(INSTALL) -d -m 755 $(DESTDIR)$(bindir)
128 $(INSTALL) -m 755 dropbearmulti$(EXEEXT) $(DESTDIR)$(bindir)
129 -chown root $(DESTDIR)$(bindir)/dropbearmulti$(EXEEXT)
130 -chgrp 0 $(DESTDIR)$(bindir)/dropbearmulti$(EXEEXT)
131
132 insmultidropbear: dropbearmulti 126 insmultidropbear: dropbearmulti
133 $(INSTALL) -d -m 755 $(DESTDIR)$(sbindir) 127 $(INSTALL) -d $(DESTDIR)$(sbindir)
134 -rm -f $(DESTDIR)$(sbindir)/dropbear$(EXEEXT) 128 -rm -f $(DESTDIR)$(sbindir)/dropbear$(EXEEXT)
135 -ln -s $(bindir)/dropbearmulti$(EXEEXT) $(DESTDIR)$(sbindir)/dropbear$(EXEEXT) 129 -ln -s $(bindir)/dropbearmulti$(EXEEXT) $(DESTDIR)$(sbindir)/dropbear$(EXEEXT)
130 $(INSTALL) -d $(DESTDIR)$(mandir)/man8
131 $(INSTALL) -m 644 dropbear.8 $(DESTDIR)$(mandir)/man8/dropbear.8
136 132
137 insmulti%: dropbearmulti 133 insmulti%: dropbearmulti
138 $(INSTALL) -d -m 755 $(DESTDIR)$(bindir) 134 $(INSTALL) -d $(DESTDIR)$(bindir)
139 -rm -f $(DESTDIR)$(bindir)/$*$(EXEEXT) 135 -rm -f $(DESTDIR)$(bindir)/$*$(EXEEXT)
140 -ln -s $(bindir)/dropbearmulti$(EXEEXT) $(DESTDIR)$(bindir)/$*$(EXEEXT) 136 -ln -s $(bindir)/dropbearmulti$(EXEEXT) $(DESTDIR)$(bindir)/$*$(EXEEXT)
137 $(INSTALL) -d $(DESTDIR)$(mandir)/man1
138 $(INSTALL) -m 644 $*.1 $(DESTDIR)$(mandir)/man1/$*.1
141 139
142 # dropbear should go in sbin, so it needs a seperate rule 140 # dropbear should go in sbin, so it needs a seperate rule
143 inst_dropbear: dropbear 141 inst_dropbear: dropbear
144 $(INSTALL) -d -m 755 $(DESTDIR)$(sbindir) 142 $(INSTALL) -d $(DESTDIR)$(sbindir)
145 $(INSTALL) -m 755 dropbear$(EXEEXT) $(DESTDIR)$(sbindir) 143 $(INSTALL) dropbear$(EXEEXT) $(DESTDIR)$(sbindir)
146 -chown root $(DESTDIR)$(sbindir)/dropbear$(EXEEXT) 144 $(INSTALL) -d $(DESTDIR)$(mandir)/man8
147 -chgrp 0 $(DESTDIR)$(sbindir)/dropbear$(EXEEXT) 145 $(INSTALL) -m 644 dropbear.8 $(DESTDIR)$(mandir)/man8/dropbear.8
148 146
149 inst_%: $* 147 inst_%: $*
150 $(INSTALL) -d -m 755 $(DESTDIR)$(bindir) 148 $(INSTALL) -d $(DESTDIR)$(bindir)
151 $(INSTALL) -m 755 $*$(EXEEXT) $(DESTDIR)$(bindir) 149 $(INSTALL) $*$(EXEEXT) $(DESTDIR)$(bindir)
152 -chown root $(DESTDIR)$(bindir)/$*$(EXEEXT) 150 $(INSTALL) -d $(DESTDIR)$(mandir)/man1
153 -chgrp 0 $(DESTDIR)$(bindir)/$*$(EXEEXT) 151 if test -e $*.1; then $(INSTALL) -m 644 $*.1 $(DESTDIR)$(mandir)/man1/$*.1; fi
152
153 inst_dropbearmulti: $(addprefix insmulti, $(PROGRAMS))
154 154
155 155
156 # for some reason the rule further down doesn't like $($@objs) as a prereq. 156 # for some reason the rule further down doesn't like $($@objs) as a prereq.
157 dropbear: $(dropbearobjs) 157 dropbear: $(dropbearobjs)
158 dbclient: $(dbclientobjs) 158 dbclient: $(dbclientobjs)