From: Hilko Bengen Date: Sun, 24 Dec 2023 20:35:03 +0100 Subject: Ignore errors of "install -d" invocations --- Makefile.in | 10 +++++----- nping/Makefile.in | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile.in b/Makefile.in index a924301..020be52 100644 --- a/Makefile.in +++ b/Makefile.in @@ -314,7 +314,7 @@ distclean-%: clean-% -cd $* && $(MAKE) distclean install-nmap: $(TARGET) - $(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(nmapdatadir) + -$(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(nmapdatadir) $(INSTALL) -c -m 755 nmap $(DESTDIR)$(bindir)/nmap # Use strip -x to avoid stripping dynamically loaded NSE functions. See # http://seclists.org/nmap-dev/2007/q4/0272.html. @@ -368,7 +368,7 @@ build-zenmap: $(ZENMAPDIR)/setup.py $(ZENMAPDIR)/zenmapCore/Version.py cd $(ZENMAPDIR) && $(PYTHON) setup.py build $(if $(DESTDIR),--executable "$(DEFAULT_PYTHON_PATH)") install-zenmap: $(ZENMAPDIR)/setup.py - $(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 + -$(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 cd $(ZENMAPDIR) && $(PYTHON) setup.py --quiet install --prefix "$(prefix)" --force $(if $(DESTDIR),--root "$(DESTDIR)") $(INSTALL) -c -m 644 docs/zenmap.1 $(DESTDIR)$(mandir)/man1/ # Create a symlink from nmapfe to zenmap if nmapfe doesn't exist or is @@ -392,8 +392,8 @@ NSE_FILES = scripts/script.db scripts/*.nse NSE_LIB_LUA_FILES = nselib/*.lua nselib/*.luadoc install-nse: $(TARGET) - $(INSTALL) -d $(DESTDIR)$(nmapdatadir)/scripts - $(INSTALL) -d $(DESTDIR)$(nmapdatadir)/nselib + -$(INSTALL) -d $(DESTDIR)$(nmapdatadir)/scripts + -$(INSTALL) -d $(DESTDIR)$(nmapdatadir)/nselib # Remove obsolete scripts from a previous installation. (cd $(DESTDIR)$(nmapdatadir)/scripts && rm -f $(OLD_SCRIPT_NAMES)) @@ -401,7 +401,7 @@ install-nse: $(TARGET) $(INSTALL) -c -m 644 nse_main.lua $(DESTDIR)$(nmapdatadir)/ $(INSTALL) -c -m 644 $(NSE_FILES) $(DESTDIR)$(nmapdatadir)/scripts $(INSTALL) -c -m 644 $(NSE_LIB_LUA_FILES) $(DESTDIR)$(nmapdatadir)/nselib - $(INSTALL) -d $(DESTDIR)$(nmapdatadir)/nselib/data + -$(INSTALL) -d $(DESTDIR)$(nmapdatadir)/nselib/data for f in `find nselib/data -name .svn -prune -o -type d -print`; do \ $(INSTALL) -d $(DESTDIR)$(nmapdatadir)/$$f; \ done diff --git a/nping/Makefile.in b/nping/Makefile.in index 3cf9c55..0db9ea5 100644 --- a/nping/Makefile.in +++ b/nping/Makefile.in @@ -124,7 +124,7 @@ distclean: clean stamp-h.in config.cache config.log config.status install-nping: $(TARGET) - $(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 + -$(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 $(INSTALL) -c -m 755 nping $(DESTDIR)$(bindir)/nping # Use strip -x to avoid stripping dynamically loaded NSE functions. See # http://seclists.org/nmap-dev/2007/q4/0272.html.