[Openvas-commits] r813 - in trunk/openvas-libraries: . libopenvas_hg
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Apr 16 15:48:22 CEST 2008
Author: jan
Date: 2008-04-16 15:48:21 +0200 (Wed, 16 Apr 2008)
New Revision: 813
Modified:
trunk/openvas-libraries/ChangeLog
trunk/openvas-libraries/Makefile
trunk/openvas-libraries/libopenvas_hg/Makefile
Log:
* Makefile, libopenvas_hg/Makefile: Add missing DESTDIR for install
targets.
Modified: trunk/openvas-libraries/ChangeLog
===================================================================
--- trunk/openvas-libraries/ChangeLog 2008-04-16 13:31:18 UTC (rev 812)
+++ trunk/openvas-libraries/ChangeLog 2008-04-16 13:48:21 UTC (rev 813)
@@ -1,5 +1,10 @@
2008-04-16 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de>
+ * Makefile, libopenvas_hg/Makefile: Add missing DESTDIR for install
+ targets.
+
+2008-04-16 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de>
+
* INSTALL_README: Remove note about bison as it is not needed anymore.
2008-04-16 Tim Brown <timb at nth-dimension.org.uk>
Modified: trunk/openvas-libraries/Makefile
===================================================================
--- trunk/openvas-libraries/Makefile 2008-04-16 13:31:18 UTC (rev 812)
+++ trunk/openvas-libraries/Makefile 2008-04-16 13:48:21 UTC (rev 813)
@@ -46,45 +46,45 @@
touch $@
install : all
- test -d ${prefix} || ${INSTALL_DIR} -m 755 ${prefix}
- test -d ${includedir}/openvas || ${INSTALL_DIR} -m 755 ${includedir}/openvas
+ test -d $(DESTDIR)${prefix} || ${INSTALL_DIR} -m 755 $(DESTDIR)${prefix}
+ test -d $(DESTDIR)${includedir}/openvas || ${INSTALL_DIR} -m 755 $(DESTDIR)${includedir}/openvas
cd libopenvas && ${MAKE} install
cd libopenvas_hg && ${MAKE} install
- $(INSTALL) -m 0444 include/libopenvas.h ${includedir}/openvas
- $(INSTALL) -m 0444 include/libvers.h ${includedir}/openvas
- $(INSTALL) -m 0444 libopenvas/getopt.h ${includedir}/openvas
- $(INSTALL) -m 0444 libopenvas/arglists.h ${includedir}/openvas
- $(INSTALL) -m 0444 libopenvas/bpf_share.h ${includedir}/openvas
- $(INSTALL) -m 0444 libopenvas/ftp_funcs.h ${includedir}/openvas
- $(INSTALL) -m 0444 libopenvas/harglists.h ${includedir}/openvas
- $(INSTALL) -m 0444 libopenvas/kb.h ${includedir}/openvas
- $(INSTALL) -m 0444 libopenvas/network.h ${includedir}/openvas
- $(INSTALL) -m 0444 libopenvas/pcap_openvas.h ${includedir}/openvas
- $(INSTALL) -m 0444 libopenvas/plugutils.h ${includedir}/openvas
- $(INSTALL) -m 0444 libopenvas/popen.h ${includedir}/openvas
- $(INSTALL) -m 0444 libopenvas/proctitle.h ${includedir}/openvas
- $(INSTALL) -m 0444 libopenvas/rand.h ${includedir}/openvas
- $(INSTALL) -m 0444 libopenvas/resolve.h ${includedir}/openvas
- $(INSTALL) -m 0444 libopenvas/scanners_utils.h ${includedir}/openvas
- $(INSTALL) -m 0444 libopenvas/services1.h ${includedir}/openvas
- $(INSTALL) -m 0444 libopenvas/share_fd.h ${includedir}/openvas
- $(INSTALL) -m 0444 libopenvas/store.h ${includedir}/openvas
- $(INSTALL) -m 0444 libopenvas/system.h ${includedir}/openvas
- $(INSTALL) -m 0444 libopenvas/www_funcs.h ${includedir}/openvas
- test -d ${bindir} || ${INSTALL_DIR} -m 755 ${bindir}
- $(INSTALL) -m 0755 libopenvas-config ${bindir}/libopenvas-config
- test -d ${mandir} || ${INSTALL_DIR} -m 755 ${mandir}
- test -d ${mandir}/man1 || ${INSTALL_DIR} -m 755 ${mandir}/man1
- $(INSTALL) -m 0644 libopenvas-config.1 ${mandir}/man1
+ $(INSTALL) -m 0444 include/libopenvas.h $(DESTDIR)${includedir}/openvas
+ $(INSTALL) -m 0444 include/libvers.h $(DESTDIR)${includedir}/openvas
+ $(INSTALL) -m 0444 libopenvas/getopt.h $(DESTDIR)${includedir}/openvas
+ $(INSTALL) -m 0444 libopenvas/arglists.h $(DESTDIR)${includedir}/openvas
+ $(INSTALL) -m 0444 libopenvas/bpf_share.h $(DESTDIR)${includedir}/openvas
+ $(INSTALL) -m 0444 libopenvas/ftp_funcs.h $(DESTDIR)${includedir}/openvas
+ $(INSTALL) -m 0444 libopenvas/harglists.h $(DESTDIR)${includedir}/openvas
+ $(INSTALL) -m 0444 libopenvas/kb.h $(DESTDIR)${includedir}/openvas
+ $(INSTALL) -m 0444 libopenvas/network.h $(DESTDIR)${includedir}/openvas
+ $(INSTALL) -m 0444 libopenvas/pcap_openvas.h $(DESTDIR)${includedir}/openvas
+ $(INSTALL) -m 0444 libopenvas/plugutils.h $(DESTDIR)${includedir}/openvas
+ $(INSTALL) -m 0444 libopenvas/popen.h $(DESTDIR)${includedir}/openvas
+ $(INSTALL) -m 0444 libopenvas/proctitle.h $(DESTDIR)${includedir}/openvas
+ $(INSTALL) -m 0444 libopenvas/rand.h $(DESTDIR)${includedir}/openvas
+ $(INSTALL) -m 0444 libopenvas/resolve.h $(DESTDIR)${includedir}/openvas
+ $(INSTALL) -m 0444 libopenvas/scanners_utils.h $(DESTDIR)${includedir}/openvas
+ $(INSTALL) -m 0444 libopenvas/services1.h $(DESTDIR)${includedir}/openvas
+ $(INSTALL) -m 0444 libopenvas/share_fd.h $(DESTDIR)${includedir}/openvas
+ $(INSTALL) -m 0444 libopenvas/store.h $(DESTDIR)${includedir}/openvas
+ $(INSTALL) -m 0444 libopenvas/system.h $(DESTDIR)${includedir}/openvas
+ $(INSTALL) -m 0444 libopenvas/www_funcs.h $(DESTDIR)${includedir}/openvas
+ test -d $(DESTDIR)${bindir} || ${INSTALL_DIR} -m 755 $(DESTDIR)${bindir}
+ $(INSTALL) -m 0755 libopenvas-config $(DESTDIR)${bindir}/libopenvas-config
+ test -d $(DESTDIR)${mandir} || ${INSTALL_DIR} -m 755 $(DESTDIR)${mandir}
+ test -d $(DESTDIR)${mandir}/man1 || ${INSTALL_DIR} -m 755 $(DESTDIR)${mandir}/man1
+ $(INSTALL) -m 0644 libopenvas-config.1 $(DESTDIR)${mandir}/man1
@echo
@echo ' --------------------------------------------------------------'
@echo ' openvas-libraries has been sucessfully installed. '
- @echo " Make sure that $(bindir) is in your PATH before you"
+ @echo " Make sure that $(DESTDIR)$(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
+ @if [ -f /etc/ld.so.conf ]; then echo " Be sure to add $(DESTDIR)$(libdir) in /etc/ld.so.conf and type 'ldconfig'"; else echo ""; fi
@echo ' --------------------------------------------------------------'
@echo
Modified: trunk/openvas-libraries/libopenvas_hg/Makefile
===================================================================
--- trunk/openvas-libraries/libopenvas_hg/Makefile 2008-04-16 13:31:18 UTC (rev 812)
+++ trunk/openvas-libraries/libopenvas_hg/Makefile 2008-04-16 13:48:21 UTC (rev 813)
@@ -43,8 +43,8 @@
test -d $(DESTDIR)${libdir} || $(INSTALL_DIR) -m 755 $(DESTDIR)${libdir}
$(LIBTOOL) --mode install $(INSTALL) libopenvas_hg.la $(DESTDIR)${libdir}
$(LIBTOOL) --finish $(DESTDIR)${libdir}
- $(INSTALL) -m 0644 hosts_gatherer.h ${includedir}/openvas
- $(INSTALL) -m 0644 hg_utils.h ${includedir}/openvas
+ $(INSTALL) -m 0644 hosts_gatherer.h $(DESTDIR)${includedir}/openvas
+ $(INSTALL) -m 0644 hg_utils.h $(DESTDIR)${includedir}/openvas
libopenvas_hg.la : $(OBJS)
$(LIBTOOL) $(CC) -o libopenvas_hg.la $(LO_OBJS) -rpath ${libdir} \
More information about the Openvas-commits
mailing list