summaryrefslogtreecommitdiff
path: root/package/nmap
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-02-15 22:30:13 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2010-02-15 22:30:13 +0100
commitc57d0300bd42fabd8eeda2a95b6c3960d6e7ce07 (patch)
treeb53bc538246b5a900300b5c6b5ea740f978196f4 /package/nmap
parentcf4b3959527339206254b8c8fc44deb391beeb10 (diff)
parent023560ac69a2ecf5659c668c26c0af6b5612a46b (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts: package/nspr/Makefile
Diffstat (limited to 'package/nmap')
-rw-r--r--package/nmap/Makefile3
-rw-r--r--package/nmap/src/sctp.h (renamed from package/nmap/extra/sctp.h)0
2 files changed, 0 insertions, 3 deletions
diff --git a/package/nmap/Makefile b/package/nmap/Makefile
index 8716879cd..22e84125b 100644
--- a/package/nmap/Makefile
+++ b/package/nmap/Makefile
@@ -27,7 +27,6 @@ CONFIGURE_ENV+= CXXFLAGS="-fno-threadsafe-statics -fno-builtin -fno-rtti -nostd
-I${STAGING_DIR}/usr/include/uClibc++" \
LIBS="-nodefaultlibs -luClibc++ -lgcc -lm"
endif
-CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --without-openssl \
--without-zenmap \
--without-ndiff \
@@ -35,8 +34,6 @@ CONFIGURE_ARGS+= --without-openssl \
--with-libdnet="${STAGING_DIR}/usr" \
--with-libpcap="${STAGING_DIR}/usr" \
--with-libpcre="${STAGING_DIR}/usr"
-BUILD_STYLE:= auto
-INSTALL_STYLE:= auto
post-install:
${INSTALL_DIR} ${IDIR_NMAP}/usr/share/nmap
diff --git a/package/nmap/extra/sctp.h b/package/nmap/src/sctp.h
index 2c24bfb53..2c24bfb53 100644
--- a/package/nmap/extra/sctp.h
+++ b/package/nmap/src/sctp.h