--- Makefile.orig	2004-01-08 16:55:13 UTC
+++ Makefile
@@ -3,8 +3,8 @@ include nessus.tmpl
 ALLDEPS = nessus.tmpl nessus-config
 
 all: $(ALLDEPS) $(PCAP_MAKE)
-	cd libnessus && ${MAKE}
-	cd libhosts_gatherer && ${MAKE}
+	${MAKE} -C libnessus
+	${MAKE} -C libhosts_gatherer
 
 nessus-config: nessus-config.pre Makefile nessus.tmpl
 	@echo Creating $@ ...
@@ -19,8 +19,8 @@ nessus.tmpl: nessus.tmpl.in configure VE
 	touch $@
 
 win32:
-	-cd libpcap-nessus    && ${MAKE} distclean
-	-cd libhosts_gatherer && ${MAKE} distclean
+	-${MAKE} -C libpcap-nessus    distclean
+	-${MAKE} -C libhosts_gatherer distclean
 	@echo
 	@echo ' --------------------------------------------------------------'
 	@echo ' The header files necessary and some docs have been generated,'
@@ -31,27 +31,26 @@ win32:
 
 
 pcap-make :
-	-cd libpcap-nessus && ${MAKE}
+	-${MAKE} -C libpcap-nessus
 
 pcap-install:
 	test -d $(DESTDIR)${prefix} || ${INSTALL_DIR} -m 755 $(DESTDIR)${prefix}
 	test -d $(DESTDIR)${libdir} || ${INSTALL_DIR} -m 755 $(DESTDIR)${libdir}
-	-cd libpcap-nessus && ${MAKE} install
+	-${MAKE} -C libpcap-nessus install
 
 pcap-clean :
-	-cd libpcap-nessus && ${MAKE} clean
+	-${MAKE} -C libpcap-nessus clean
 
 pcap-distclean:
-	-cd libpcap-nessus && ${MAKE} distclean
+	-${MAKE} -C libpcap-nessus distclean
 
 install : $(PCAP_INSTALL)
 	test -d $(DESTDIR)${prefix} || ${INSTALL_DIR} -m 755 $(DESTDIR)${prefix}
 	test -d $(DESTDIR)${includedir}/nessus || ${INSTALL_DIR} -m 755 $(DESTDIR)${includedir}/nessus
-	cd libnessus && ${MAKE} install
-	cd libhosts_gatherer && ${MAKE} install
+	${MAKE} -C libnessus install
+	${MAKE} -C libhosts_gatherer install
 
 
-	$(INSTALL) -m 0444 include/includes.h $(DESTDIR)${includedir}/nessus
 	$(INSTALL) -m 0444 include/libnessus.h $(DESTDIR)${includedir}/nessus
 	$(INSTALL) -m 0444 include/harglists.h $(DESTDIR)${includedir}/nessus
 	$(INSTALL) -m 0444 include/libvers.h   $(DESTDIR)${includedir}/nessus
@@ -64,22 +63,13 @@ install : $(PCAP_INSTALL)
 	test -d $(DESTDIR)${mandir}/man1 || ${INSTALL_DIR} -m 755 $(DESTDIR)${mandir}/man1
 	$(INSTALL) -m 0644 nessus-config.1 $(DESTDIR)${mandir}/man1
 
-	@echo
-	@echo ' --------------------------------------------------------------'
-	@echo ' nessus-libraries has been sucessfully installed. '
-	@echo " Make sure that $(bindir) is in your PATH before you"
-	@echo " continue "
-	@if [ -f /etc/ld.so.conf ]; then echo " Be sure to add $(libdir) in /etc/ld.so.conf and type 'ldconfig'"; else echo ""; fi
-	@echo ' --------------------------------------------------------------'
-	@echo
-
 clean : $(PCAP_CLEAN)
-	-cd libnessus && ${MAKE} clean
-	-cd libhosts_gatherer && ${MAKE} clean
+	-${MAKE} -C libnessus clean
+	-${MAKE} -C libhosts_gatherer clean
 
 distclean : clean $(PCAP_DISTCLEAN)
 	rm -f ${rootdir}/include/config.h libtool config.cache \
 	config.status config.log ${rootdir}/include/libvers.h 
-	-cd libnessus && ${MAKE} distclean
-	-cd libhosts_gatherer && ${MAKE} distclean
+	-${MAKE} -C libnessus distclean
+	-${MAKE} -C libhosts_gatherer distclean
 	rm -f nessus.tmpl nessus-config nessus-config.pre uninstall-nessus