Merge remote-tracking branch 'mfischer/expat' into next

[people/pmueller/ipfire-2.x.git] / make.sh

diff --git a/make.sh b/make.sh
index 9309ddaa257b32de8f1acbc80f34bc822d3a1620..7d41b591c27ed551fbbd9ccd5dcea31345014005 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -649,7 +649,7 @@ buildipfire() {
   ipfiremake libevent2
   ipfiremake portmap
   ipfiremake nfs
-  #ipfiremake nmap
+  ipfiremake nmap
   ipfiremake ncftp
   ipfiremake etherwake
   ipfiremake bwm-ng
@@ -811,6 +811,7 @@ buildipfire() {
   ipfiremake pigz
   ipfiremake tmux
   ipfiremake swconfig
+  ipfiremake haproxy
 }
 
 buildinstaller() {