* [gentoo-commits] gentoo-x86 commit in net-analyzer/nessus-client/files: nessus-client-1.0.2-make.patch
@ 2010-08-22 23:19 Jeroen Roovers (jer)
0 siblings, 0 replies; 2+ messages in thread
From: Jeroen Roovers (jer) @ 2010-08-22 23:19 UTC (permalink / raw
To: gentoo-commits
jer 10/08/22 23:19:39
Added: nessus-client-1.0.2-make.patch
Log:
Respect LDFLAGS (bug #333799). Install documentation where it belongs. Fix parallel make.
(Portage version: 2.2_rc67/cvs/Linux i686)
Revision Changes Path
1.1 net-analyzer/nessus-client/files/nessus-client-1.0.2-make.patch
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
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
Index: nessus-client-1.0.2-make.patch
===================================================================
--- a/Makefile 2006-12-23 15:27:39.000000000 +0100
+++ b/Makefile 2010-08-23 01:12:51.000000000 +0200
@@ -2,8 +2,10 @@
ALLDEPS = nessus.tmpl
-all: libnessus-client client sslstuff
-
+all:
+ $(MAKE) -C libnessus
+ $(MAKE) -C nessus
+ $(MAKE) -C ssl
nessus.tmpl: nessus.tmpl.in configure VERSION
$(SHELL) configure $(CONFIGURE_ARGS)
@@ -21,20 +23,17 @@
$(INSTALL) -m $(CLIENTMODE) nessusclient-mkcert $(DESTDIR)${bindir}
$(INSTALL) -m $(CLIENTMODE) ssl/nessusclient-mkrand $(DESTDIR)${bindir}
-sslstuff:
- cd ssl && $(MAKE)
-
install-man:
@echo installing man pages ...
@test -d $(DESTDIR)${mandir}/man1 || $(INSTALL_DIR) $(DESTDIR)${mandir}/man1
@test -d $(DESTDIR)${mandir}/man8 || $(INSTALL_DIR) $(DESTDIR)${mandir}/man8
@test -d $(DESTDIR)${datadir}/doc/ || $(INSTALL_DIR) $(DESTDIR)${datadir}/doc/
- @test -d $(DESTDIR)${datadir}/doc/NessusClient || $(INSTALL_DIR) $(DESTDIR)${datadir}/doc/NessusClient
+ @test -d $(NESSUS_DOCDIR) || $(INSTALL_DIR) $(NESSUS_DOCDIR)
$(INSTALL) -c -m 0444 ${MAN_NESSUS_1} $(DESTDIR)${mandir}/man1/NessusClient.1
$(INSTALL) -c -m 0444 doc/nessusclient-mkcert.1 $(DESTDIR)${mandir}/man1/nessusclient-mkcert.1
$(INSTALL) -c -m 0444 doc/nessusclient-mkrand.1 $(DESTDIR)${mandir}/man1/nessusclient-mkrand.1
- $(INSTALL) -c -m 0444 doc/NessusClient_UserGuide.pdf $(DESTDIR)${datadir}/doc/NessusClient/NessusClient_UserGuide.pdf
+ $(INSTALL) -c -m 0444 doc/NessusClient_UserGuide.pdf $(NESSUS_DOCDIR)/NessusClient_UserGuide.pdf
win32: ${MAN_NESSUS_1}
$(MANROFF) ${MAN_NESSUS_1} > doc/NessusClient.1.cat
@@ -45,23 +44,15 @@
@echo ' --------------------------------------------------------------'
@echo
-client-install : client
+client-install : nessus
test -d $(DESTDIR)${bindir} || $(INSTALL_DIR) -m 755 $(DESTDIR)${bindir}
$(INSTALL) -m $(CLIENTMODE) ${make_bindir}/NessusClient $(DESTDIR)${bindir}
-client :
- cd nessus && $(MAKE)
-
-libnessus-client:
- cd libnessus && $(MAKE)
-
-
doc : $(MAN_NESSUS_1)
$(MAN_NESSUS_1) : $(MAN_NESSUS_1).in
@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)
-
clean:
cd nessus && $(MAKE) clean
cd libnessus && $(MAKE) clean
--- ssl/Makefile.orig 2006-09-12 23:41:31.000000000 +0200
+++ ssl/Makefile 2010-08-23 01:16:51.000000000 +0200
@@ -6,7 +6,7 @@
all : nessusclient-mkrand
nessusclient-mkrand: $(OBJS)
- $(CC) $(OBJS) -o nessusclient-mkrand -lm
+ $(CC) $(LDFLAGS) $(OBJS) -o nessusclient-mkrand -lm
nessusclient-mkrand.o: nessusclient-mkrand.c
$(CC) $(CFLAGS) -c nessusclient-mkrand.c
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-analyzer/nessus-client/files: nessus-client-1.0.2-make.patch
@ 2010-08-22 23:25 Jeroen Roovers (jer)
0 siblings, 0 replies; 2+ messages in thread
From: Jeroen Roovers (jer) @ 2010-08-22 23:25 UTC (permalink / raw
To: gentoo-commits
jer 10/08/22 23:25:31
Modified: nessus-client-1.0.2-make.patch
Log:
Remove testing cruft. Clean up patch.
(Portage version: 2.2_rc67/cvs/Linux i686)
Revision Changes Path
1.2 net-analyzer/nessus-client/files/nessus-client-1.0.2-make.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nessus-client/files/nessus-client-1.0.2-make.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nessus-client/files/nessus-client-1.0.2-make.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nessus-client/files/nessus-client-1.0.2-make.patch?r1=1.1&r2=1.2
Index: nessus-client-1.0.2-make.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nessus-client/files/nessus-client-1.0.2-make.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nessus-client-1.0.2-make.patch 22 Aug 2010 23:19:39 -0000 1.1
+++ nessus-client-1.0.2-make.patch 22 Aug 2010 23:25:31 -0000 1.2
@@ -61,8 +61,8 @@
clean:
cd nessus && $(MAKE) clean
cd libnessus && $(MAKE) clean
---- ssl/Makefile.orig 2006-09-12 23:41:31.000000000 +0200
-+++ ssl/Makefile 2010-08-23 01:16:51.000000000 +0200
+--- a/ssl/Makefile 2006-09-12 23:41:31.000000000 +0200
++++ b/ssl/Makefile 2010-08-23 01:16:51.000000000 +0200
@@ -6,7 +6,7 @@
all : nessusclient-mkrand
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-08-22 23:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-22 23:19 [gentoo-commits] gentoo-x86 commit in net-analyzer/nessus-client/files: nessus-client-1.0.2-make.patch Jeroen Roovers (jer)
-- strict thread matches above, loose matches on Subject: below --
2010-08-22 23:25 Jeroen Roovers (jer)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox