mirror of
https://github.com/nmap/nmap.git
synced 2025-12-06 12:41:29 +00:00
Add a separate build-umit step to the main makefile. This means that the build phase of Umit can occur as a non-root user, which means that "make clean" won't bomb out because it can't delete the directories created by root.
This commit is contained in:
@@ -55,6 +55,7 @@ TARGET = nmap
|
|||||||
TARGETNMAPFE=@TARGETNMAPFE@
|
TARGETNMAPFE=@TARGETNMAPFE@
|
||||||
INSTALLNMAPFE=@INSTALLNMAPFE@
|
INSTALLNMAPFE=@INSTALLNMAPFE@
|
||||||
INSTALLNSE=@INSTALLNSE@
|
INSTALLNSE=@INSTALLNSE@
|
||||||
|
BUILDUMIT=@BUILDUMIT@
|
||||||
INSTALLUMIT=@INSTALLUMIT@
|
INSTALLUMIT=@INSTALLUMIT@
|
||||||
|
|
||||||
ifneq (@LIBLUA_LIBS@,)
|
ifneq (@LIBLUA_LIBS@,)
|
||||||
@@ -74,7 +75,7 @@ OBJS = main.o nmap.o targets.o tcpip.o nmap_error.o utils.o idle_scan.o osscan.o
|
|||||||
.cc.o:
|
.cc.o:
|
||||||
$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@
|
$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@
|
||||||
|
|
||||||
all: $(TARGET) $(TARGETNMAPFE)
|
all: $(TARGET) $(TARGETNMAPFE) $(BUILDUMIT)
|
||||||
$(TARGET): $(DEPS) @LUA_DEPENDS@ @PCAP_DEPENDS@ @PCRE_DEPENDS@ @DNET_DEPENDS@ $(NBASEDIR)/libnbase.a $(NSOCKDIR)/src/libnsock.a $(NSESTDLIB) $(OBJS)
|
$(TARGET): $(DEPS) @LUA_DEPENDS@ @PCAP_DEPENDS@ @PCRE_DEPENDS@ @DNET_DEPENDS@ $(NBASEDIR)/libnbase.a $(NSOCKDIR)/src/libnsock.a $(NSESTDLIB) $(OBJS)
|
||||||
echo Compiling nmap
|
echo Compiling nmap
|
||||||
rm -f $@
|
rm -f $@
|
||||||
@@ -206,6 +207,9 @@ install-nmapfe: $(TARGETNMAPFE)
|
|||||||
$(UMITDIR)/setup.py:
|
$(UMITDIR)/setup.py:
|
||||||
cd $(UMITDIR) && install_scripts/unix/setup.sh
|
cd $(UMITDIR) && install_scripts/unix/setup.sh
|
||||||
|
|
||||||
|
build-umit: $(UMITDIR)/setup.py
|
||||||
|
cd $(UMITDIR) && $(PYTHON) setup.py build
|
||||||
|
|
||||||
install-umit: $(UMITDIR)/setup.py
|
install-umit: $(UMITDIR)/setup.py
|
||||||
cd $(UMITDIR) && $(PYTHON) setup.py install --prefix $(DESTDIR)$(prefix)
|
cd $(UMITDIR) && $(PYTHON) setup.py install --prefix $(DESTDIR)$(prefix)
|
||||||
|
|
||||||
|
|||||||
6
configure
vendored
6
configure
vendored
@@ -313,7 +313,7 @@ ac_subdirs_all="$ac_subdirs_all libpcre"
|
|||||||
ac_subdirs_all="$ac_subdirs_all libdnet-stripped"
|
ac_subdirs_all="$ac_subdirs_all libdnet-stripped"
|
||||||
ac_subdirs_all="$ac_subdirs_all nselib"
|
ac_subdirs_all="$ac_subdirs_all nselib"
|
||||||
ac_subdirs_all="$ac_subdirs_all $nmap_cfg_subdirs"
|
ac_subdirs_all="$ac_subdirs_all $nmap_cfg_subdirs"
|
||||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS libpcapdir pcredir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CXXPROG COMPAT_OBJS COMPAT_SRCS build build_cpu build_vendor build_os host host_cpu host_vendor host_os LUAFLAGS CPP EGREP TARGETNMAPFE INSTALLNMAPFE INSTALLUMIT UMIT_CLEAN UMIT_DIST_CLEAN OPENSSL_LIBS PCAP_DEPENDS PCAP_CLEAN PCAP_DIST_CLEAN LIBPCAP_LIBS subdirs LIBPCRE_LIBS LIBPCREDIR PCRE_DEPENDS PCRE_CLEAN PCRE_DIST_CLEAN LIBDNET_LIBS LIBDNETDIR DNET_DEPENDS DNET_CLEAN DNET_DIST_CLEAN LIBLUA_LIBS LIBLUADIR LUA_DEPENDS LUA_CLEAN LUA_DIST_CLEAN INSTALLNSE NSELIB_CLEAN NSELIB_DIST_CLEAN NBASEDIR LIBNBASE_LIBS NSOCKDIR LIBNSOCK_LIBS GTK_CONFIG LIBOBJS LTLIBOBJS'
|
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS libpcapdir pcredir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CXXPROG COMPAT_OBJS COMPAT_SRCS build build_cpu build_vendor build_os host host_cpu host_vendor host_os LUAFLAGS CPP EGREP TARGETNMAPFE INSTALLNMAPFE BUILDUMIT INSTALLUMIT UMIT_CLEAN UMIT_DIST_CLEAN OPENSSL_LIBS PCAP_DEPENDS PCAP_CLEAN PCAP_DIST_CLEAN LIBPCAP_LIBS subdirs LIBPCRE_LIBS LIBPCREDIR PCRE_DEPENDS PCRE_CLEAN PCRE_DIST_CLEAN LIBDNET_LIBS LIBDNETDIR DNET_DEPENDS DNET_CLEAN DNET_DIST_CLEAN LIBLUA_LIBS LIBLUADIR LUA_DEPENDS LUA_CLEAN LUA_DIST_CLEAN INSTALLNSE NSELIB_CLEAN NSELIB_DIST_CLEAN NBASEDIR LIBNBASE_LIBS NSOCKDIR LIBNSOCK_LIBS GTK_CONFIG LIBOBJS LTLIBOBJS'
|
||||||
ac_subst_files=''
|
ac_subst_files=''
|
||||||
|
|
||||||
# Initialize some variables set by options.
|
# Initialize some variables set by options.
|
||||||
@@ -4033,6 +4033,7 @@ fi;
|
|||||||
|
|
||||||
|
|
||||||
# Do they want UMIT?
|
# Do they want UMIT?
|
||||||
|
BUILDUMIT=build-umit
|
||||||
INSTALLUMIT=install-umit
|
INSTALLUMIT=install-umit
|
||||||
UMIT_CLEAN=umit_clean
|
UMIT_CLEAN=umit_clean
|
||||||
UMIT_DIST_CLEAN=umit_dist_clean
|
UMIT_DIST_CLEAN=umit_dist_clean
|
||||||
@@ -4042,6 +4043,7 @@ if test "${with_umit+set}" = set; then
|
|||||||
withval="$with_umit"
|
withval="$with_umit"
|
||||||
case "$with_umit" in
|
case "$with_umit" in
|
||||||
no)
|
no)
|
||||||
|
BUILDUMIT=""
|
||||||
INSTALLUMIT=""
|
INSTALLUMIT=""
|
||||||
UMIT_CLEAN=""
|
UMIT_CLEAN=""
|
||||||
UMIT_DIST_CLEAN=""
|
UMIT_DIST_CLEAN=""
|
||||||
@@ -4054,6 +4056,7 @@ fi;
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# We test whether they specified openssl desires explicitly
|
# We test whether they specified openssl desires explicitly
|
||||||
use_openssl="yes"
|
use_openssl="yes"
|
||||||
specialssldir=""
|
specialssldir=""
|
||||||
@@ -7743,6 +7746,7 @@ s,@CPP@,$CPP,;t t
|
|||||||
s,@EGREP@,$EGREP,;t t
|
s,@EGREP@,$EGREP,;t t
|
||||||
s,@TARGETNMAPFE@,$TARGETNMAPFE,;t t
|
s,@TARGETNMAPFE@,$TARGETNMAPFE,;t t
|
||||||
s,@INSTALLNMAPFE@,$INSTALLNMAPFE,;t t
|
s,@INSTALLNMAPFE@,$INSTALLNMAPFE,;t t
|
||||||
|
s,@BUILDUMIT@,$BUILDUMIT,;t t
|
||||||
s,@INSTALLUMIT@,$INSTALLUMIT,;t t
|
s,@INSTALLUMIT@,$INSTALLUMIT,;t t
|
||||||
s,@UMIT_CLEAN@,$UMIT_CLEAN,;t t
|
s,@UMIT_CLEAN@,$UMIT_CLEAN,;t t
|
||||||
s,@UMIT_DIST_CLEAN@,$UMIT_DIST_CLEAN,;t t
|
s,@UMIT_DIST_CLEAN@,$UMIT_DIST_CLEAN,;t t
|
||||||
|
|||||||
@@ -187,18 +187,21 @@ AC_SUBST(TARGETNMAPFE)
|
|||||||
AC_SUBST(INSTALLNMAPFE)
|
AC_SUBST(INSTALLNMAPFE)
|
||||||
|
|
||||||
# Do they want UMIT?
|
# Do they want UMIT?
|
||||||
|
BUILDUMIT=build-umit
|
||||||
INSTALLUMIT=install-umit
|
INSTALLUMIT=install-umit
|
||||||
UMIT_CLEAN=umit_clean
|
UMIT_CLEAN=umit_clean
|
||||||
UMIT_DIST_CLEAN=umit_dist_clean
|
UMIT_DIST_CLEAN=umit_dist_clean
|
||||||
AC_ARG_WITH(umit, AC_HELP_STRING([--without-umit], [Skip installation of the UMIT graphical frontend]),
|
AC_ARG_WITH(umit, AC_HELP_STRING([--without-umit], [Skip installation of the UMIT graphical frontend]),
|
||||||
[ case "$with_umit" in
|
[ case "$with_umit" in
|
||||||
no)
|
no)
|
||||||
|
BUILDUMIT=""
|
||||||
INSTALLUMIT=""
|
INSTALLUMIT=""
|
||||||
UMIT_CLEAN=""
|
UMIT_CLEAN=""
|
||||||
UMIT_DIST_CLEAN=""
|
UMIT_DIST_CLEAN=""
|
||||||
;;
|
;;
|
||||||
esac]
|
esac]
|
||||||
)
|
)
|
||||||
|
AC_SUBST(BUILDUMIT)
|
||||||
AC_SUBST(INSTALLUMIT)
|
AC_SUBST(INSTALLUMIT)
|
||||||
AC_SUBST(UMIT_CLEAN)
|
AC_SUBST(UMIT_CLEAN)
|
||||||
AC_SUBST(UMIT_DIST_CLEAN)
|
AC_SUBST(UMIT_DIST_CLEAN)
|
||||||
|
|||||||
Reference in New Issue
Block a user