summaryrefslogtreecommitdiff
path: root/security/libssh/patches/patch-ab
blob: bef9ffd0f7cca46ef73f0bef523f0abb8b655f98 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
$NetBSD: patch-ab,v 1.1 2009/11/25 21:11:33 joerg Exp $

--- Makefile.in.orig	2005-03-04 20:54:59.000000000 +0100
+++ Makefile.in
@@ -15,7 +15,7 @@ mandir = $(prefix)/man/man1
 CC = @CC@
 CFLAGS = @CFLAGS@ -Iinclude/ -Wall -g
 LDFLAGS = @LDFLAGS@ 
-LIBS = -lssh -Llibssh/
+LIBS = -Llibssh -lssh
 INSTALL = @INSTALL@
 LN= @LN_S@
 OBJECTS= sample.o samplesshd.o
@@ -27,9 +27,9 @@ all: $(CONFIG) $(OBJECTS)
 	  (cd $$dir && $(MAKE) all) \
 	  || case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \
 	done && test -z "$$fail"
-	$(CC) -o samplessh sample.o $(LDFLAGS) $(LIBS)
+	$(CC) -o samplessh sample.o $(LIBS) $(LDFLAGS)
 	$(LN) -sf samplessh samplesftp
-	$(CC) -o samplesshd samplesshd.o $(LDFLAGS) $(LIBS)
+	$(CC) -o samplesshd samplesshd.o $(LIBS) $(LDFLAGS)
 $(CONFIG):
 	$(LN) -f ../../config.h $(CONFIG)
 dist:
@@ -56,11 +56,11 @@ install: all
 	  || case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \
 	done && test -z "$$fail"
 	$(top_srcdir)/mkinstalldirs $(incldir)/libssh
-	$(INSTALL) include/libssh/libssh.h $(incldir)/libssh/
-	$(INSTALL) include/libssh/config.h $(incldir)/libssh/
-	$(INSTALL) include/libssh/sftp.h $(incldir)/libssh/
-	$(INSTALL) include/libssh/crypto.h $(incldir)/libssh/
-	$(INSTALL) include/libssh/server.h $(incldir)/libssh/
+	$(BSD_INSTALL_DATA) include/libssh/libssh.h $(incldir)/libssh/
+	$(BSD_INSTALL_DATA) include/libssh/config.h $(incldir)/libssh/
+	$(BSD_INSTALL_DATA) include/libssh/sftp.h $(incldir)/libssh/
+	$(BSD_INSTALL_DATA) include/libssh/crypto.h $(incldir)/libssh/
+	$(BSD_INSTALL_DATA) include/libssh/server.h $(incldir)/libssh/
 clean:
 	/bin/rm -f *~ *.o ssh sftp
 	@for dir in ${subdirs}; do \