| 1 |
jer 10/08/22 23:19:39 |
| 2 |
|
| 3 |
Added: nessus-client-1.0.2-make.patch |
| 4 |
Log: |
| 5 |
Respect LDFLAGS (bug #333799). Install documentation where it belongs. Fix parallel make. |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 net-analyzer/nessus-client/files/nessus-client-1.0.2-make.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nessus-client/files/nessus-client-1.0.2-make.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nessus-client/files/nessus-client-1.0.2-make.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: nessus-client-1.0.2-make.patch |
| 15 |
=================================================================== |
| 16 |
--- a/Makefile 2006-12-23 15:27:39.000000000 +0100 |
| 17 |
+++ b/Makefile 2010-08-23 01:12:51.000000000 +0200 |
| 18 |
@@ -2,8 +2,10 @@ |
| 19 |
|
| 20 |
ALLDEPS = nessus.tmpl |
| 21 |
|
| 22 |
-all: libnessus-client client sslstuff |
| 23 |
- |
| 24 |
+all: |
| 25 |
+ $(MAKE) -C libnessus |
| 26 |
+ $(MAKE) -C nessus |
| 27 |
+ $(MAKE) -C ssl |
| 28 |
|
| 29 |
nessus.tmpl: nessus.tmpl.in configure VERSION |
| 30 |
$(SHELL) configure $(CONFIGURE_ARGS) |
| 31 |
@@ -21,20 +23,17 @@ |
| 32 |
$(INSTALL) -m $(CLIENTMODE) nessusclient-mkcert $(DESTDIR)${bindir} |
| 33 |
$(INSTALL) -m $(CLIENTMODE) ssl/nessusclient-mkrand $(DESTDIR)${bindir} |
| 34 |
|
| 35 |
-sslstuff: |
| 36 |
- cd ssl && $(MAKE) |
| 37 |
- |
| 38 |
install-man: |
| 39 |
@echo installing man pages ... |
| 40 |
@test -d $(DESTDIR)${mandir}/man1 || $(INSTALL_DIR) $(DESTDIR)${mandir}/man1 |
| 41 |
@test -d $(DESTDIR)${mandir}/man8 || $(INSTALL_DIR) $(DESTDIR)${mandir}/man8 |
| 42 |
@test -d $(DESTDIR)${datadir}/doc/ || $(INSTALL_DIR) $(DESTDIR)${datadir}/doc/ |
| 43 |
- @test -d $(DESTDIR)${datadir}/doc/NessusClient || $(INSTALL_DIR) $(DESTDIR)${datadir}/doc/NessusClient |
| 44 |
+ @test -d $(NESSUS_DOCDIR) || $(INSTALL_DIR) $(NESSUS_DOCDIR) |
| 45 |
|
| 46 |
$(INSTALL) -c -m 0444 ${MAN_NESSUS_1} $(DESTDIR)${mandir}/man1/NessusClient.1 |
| 47 |
$(INSTALL) -c -m 0444 doc/nessusclient-mkcert.1 $(DESTDIR)${mandir}/man1/nessusclient-mkcert.1 |
| 48 |
$(INSTALL) -c -m 0444 doc/nessusclient-mkrand.1 $(DESTDIR)${mandir}/man1/nessusclient-mkrand.1 |
| 49 |
- $(INSTALL) -c -m 0444 doc/NessusClient_UserGuide.pdf $(DESTDIR)${datadir}/doc/NessusClient/NessusClient_UserGuide.pdf |
| 50 |
+ $(INSTALL) -c -m 0444 doc/NessusClient_UserGuide.pdf $(NESSUS_DOCDIR)/NessusClient_UserGuide.pdf |
| 51 |
|
| 52 |
win32: ${MAN_NESSUS_1} |
| 53 |
$(MANROFF) ${MAN_NESSUS_1} > doc/NessusClient.1.cat |
| 54 |
@@ -45,23 +44,15 @@ |
| 55 |
@echo ' --------------------------------------------------------------' |
| 56 |
@echo |
| 57 |
|
| 58 |
-client-install : client |
| 59 |
+client-install : nessus |
| 60 |
test -d $(DESTDIR)${bindir} || $(INSTALL_DIR) -m 755 $(DESTDIR)${bindir} |
| 61 |
$(INSTALL) -m $(CLIENTMODE) ${make_bindir}/NessusClient $(DESTDIR)${bindir} |
| 62 |
|
| 63 |
-client : |
| 64 |
- cd nessus && $(MAKE) |
| 65 |
- |
| 66 |
-libnessus-client: |
| 67 |
- cd libnessus && $(MAKE) |
| 68 |
- |
| 69 |
- |
| 70 |
doc : $(MAN_NESSUS_1) |
| 71 |
|
| 72 |
$(MAN_NESSUS_1) : $(MAN_NESSUS_1).in |
| 73 |
@sed -e 's?@NESSUSD_CONFDIR@?${NESSUSD_CONFDIR}?g;s?@NESSUSD_DATADIR@?${NESSUSD_DATADIR}?g;s?@NESSUSD_PLUGINS@?${NESSUSD_PLUGINS}?g;' $(MAN_NESSUS_1).in >$(MAN_NESSUS_1) |
| 74 |
|
| 75 |
- |
| 76 |
clean: |
| 77 |
cd nessus && $(MAKE) clean |
| 78 |
cd libnessus && $(MAKE) clean |
| 79 |
--- ssl/Makefile.orig 2006-09-12 23:41:31.000000000 +0200 |
| 80 |
+++ ssl/Makefile 2010-08-23 01:16:51.000000000 +0200 |
| 81 |
@@ -6,7 +6,7 @@ |
| 82 |
all : nessusclient-mkrand |
| 83 |
|
| 84 |
nessusclient-mkrand: $(OBJS) |
| 85 |
- $(CC) $(OBJS) -o nessusclient-mkrand -lm |
| 86 |
+ $(CC) $(LDFLAGS) $(OBJS) -o nessusclient-mkrand -lm |
| 87 |
|
| 88 |
nessusclient-mkrand.o: nessusclient-mkrand.c |
| 89 |
$(CC) $(CFLAGS) -c nessusclient-mkrand.c |
Archives