Merge branch 'rel/5.1' into emane-cleanup
This commit is contained in:
commit
952cd2ffbd
2 changed files with 1 additions and 4 deletions
|
@ -203,9 +203,6 @@ else
|
|||
fi
|
||||
|
||||
# Output files
|
||||
#gui/core-gui
|
||||
#scripts/core-daemon.service
|
||||
#daemon/core/constants.py
|
||||
AC_CONFIG_FILES([Makefile
|
||||
gui/version.tcl
|
||||
gui/Makefile
|
||||
|
|
|
@ -11,7 +11,7 @@ SYSCTL_BIN = "@sysctl_path@/sysctl"
|
|||
IP_BIN = "@ip_path@/ip"
|
||||
TC_BIN = "@tc_path@/tc"
|
||||
EBTABLES_BIN = "@ebtables_path@/ebtables"
|
||||
QUAGGA_STATE_DIR = "@CORE_STATE_DIR@/run/quagga"
|
||||
QUAGGA_STATE_DIR = "/var/run/quagga"
|
||||
MOUNT_BIN = "@mount_path@/mount"
|
||||
UMOUNT_BIN = "@umount_path@/umount"
|
||||
OVS_BIN = "@ovs_vs_path@/ovs-vsctl"
|
||||
|
|
Loading…
Reference in a new issue