From 4c79043958e54f49a2e7143dfc5843bd3efc9cd0 Mon Sep 17 00:00:00 2001 From: kris Date: Thu, 16 Aug 2007 20:16:10 +0000 Subject: [PATCH] Merging r5523 from my umit-integration branch - Modifying Makefiles and making my own modified scripts --- Makefile.in | 4 ++-- mswin32/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.in b/Makefile.in index b71ee9bc5..4826ecfbb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -198,8 +198,8 @@ install-nmapfe: $(TARGETNMAPFE) @echo "If the next command fails -- you cannot use the X front end" -test -f nmapfe/nmapfe && $(INSTALL) -c -m 755 -s nmapfe/nmapfe $(DESTDIR)$(bindir)/nmapfe && rm -f $(DESTDIR)$(bindir)/xnmap && $(SHTOOL) mkln -f -s $(DESTDIR)$(bindir)/nmapfe $(DESTDIR)$(bindir)/xnmap && $(INSTALL) -c -m 644 nmapfe.desktop $(DESTDIR)$(deskdir)/nmapfe.desktop && $(INSTALL) -c -m 644 docs/nmapfe.1 $(DESTDIR)$(mandir)/man1/nmapfe.1 && $(INSTALL) -c -m 644 docs/xnmap.1 $(DESTDIR)$(mandir)/man1/xnmap.1 -install-umit: umit/setup.py - cd umit && python setup.py install --prefix $(DESTDIR)$(prefix) +install-umit: umit/install_scripts/linux/setup.py + cd umit && install_scripts/linux/setup.sh && python setup.py install --prefix $(DESTDIR)$(prefix) NSE_FILES = scripts/script.db scripts/*.nse NSE_LIB_FILES = nselib/*lua nselib/*so diff --git a/mswin32/Makefile b/mswin32/Makefile index dd265da5e..554720ccc 100644 --- a/mswin32/Makefile +++ b/mswin32/Makefile @@ -28,8 +28,8 @@ winbuild: cd Release && cp -f $(NSE_LIB_FILES) ../nmap-$(NMAP_VERSION)/nselib/ zip -r nmap-$(NMAP_VERSION)-win32.zip nmap-$(NMAP_VERSION) cp winpcap/winpcap-nmap-*.exe nmap-$(NMAP_VERSION) - cd nmap-$(NMAP_VERSION) && mkdir umit - cd ../umit && utils/copy_win_deps.bat + mkdir nmap-$(NMAP_VERSION)/umit + cd ../umit && install_scripts/windows/copy_and_compile.bat cp -R ../umit/dist/* ../umit/COPYING* ../umit/README nmap-$(NMAP_VERSION)/umit cp nsis/AddToPath.nsh nsis/Nmap.nsi nsis/shortcuts.ini nmap-$(NMAP_VERSION) $(MAKENSIS) nmap-$(NMAP_VERSION)/Nmap.nsi