$NetBSD: patch-aa,v 1.7 2001/08/24 11:23:16 abs Exp $ --- Makefile.in.orig Tue May 9 07:25:42 2000 +++ Makefile.in @@ -12,8 +12,9 @@ CC = @CC@ CCOPT = -LIBPCAPDIR = @libpcapdir@ -INCLS = -I. -I$(LIBPCAPDIR) +#LIBPCAPDIR = @libpcapdir@ +INCLS = -I. +#INCLS += -I$(LIBPCAPDIR) DEFS = @DEFS@ -DNMAP_VERSION=\"$(NMAP_VERSION)\" -DNMAP_NAME=\"$(NMAP_NAME)\" -DNMAP_URL=\"$(NMAP_URL)\" -DNMAPDATADIR=\"$(nmapdatadir)\" CFLAGS = @CFLAGS@ $(CCOPT) $(DEFS) $(INCLS) # CFLAGS = -g -Wall $(DEFS) $(INCLS) @@ -36,15 +37,15 @@ DEPS = nmap.h error.h targets.h osscan.h tcpip.h utils.h global_structures.h charpool.h services.h rpc.h portlist.h -all: $(TARGET) nmapfe/nmapfe +all: $(TARGET) $(TARGET): $(DEPS) @PCAP_DEPENDS@ $(OBJS) @echo Compiling nmap rm -f $@ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) -$(LIBPCAPDIR)/libpcap.a: $(LIBPCAPDIR)/Makefile - @echo Compiling libpcap; cd $(LIBPCAPDIR); $(MAKE) +#$(LIBPCAPDIR)/libpcap.a: $(LIBPCAPDIR)/Makefile +# @echo Compiling libpcap; cd $(LIBPCAPDIR); $(MAKE) #$(LIBPCAPDIR)/Makefile: # @echo Configuring libpcap; cd $(LIBPCAPDIR); ./configure @@ -140,7 +141,7 @@ $(MAKEDEPEND) $(INCLS) -s "# DO NOT DELETE" -- $(DEFS) -- $(SRCS) install: $(TARGET) - $(SHTOOL) mkdir -f -p -m 755 $(bindir) $(mandir)/man1 $(nmapdatadir) $(deskdir) + $(SHTOOL) mkdir -f -p -m 755 $(bindir) $(mandir)/man1 $(nmapdatadir) $(INSTALL) -c -m 755 nmap $(bindir)/nmap @echo "If the next command fails -- you cannot use the X front end" -test -f nmapfe/nmapfe && $(INSTALL) -c -m 755 nmapfe/nmapfe $(bindir)/nmapfe && $(SHTOOL) mkln -f -s $(bindir)/nmapfe $(bindir)/xnmap && $(INSTALL) -c -m 644 nmapfe.desktop $(deskdir)/nmapfe.desktop && $(INSTALL) -c -m 644 docs/nmapfe.1 $(mandir)/man1/nmapfe.1 && $(INSTALL) -c -m 644 docs/xnmap.1 $(mandir)/man1/xnmap.1