diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..5c7778e --- /dev/null +++ b/Makefile @@ -0,0 +1,17 @@ +DIRS := nfq tpws ip2net mdig +TGT := binaries/my + +all: clean + mkdir -p "$(@D)/$(TGT)"; \ + for dir in $(DIRS); do \ + $(MAKE) -C "$(@D)/$$dir" || exit 1; \ + done ; \ + for exe in $$(find ${DIRS} -type f -executable); do \ + mv -f "$(@D)/$$exe" "$(@D)/${TGT}" ; \ + ln -fs "../${TGT}/$$(basename "$$exe")" "$$exe" ; \ + done \ + +clean: + for dir in $(DIRS); do \ + $(MAKE) -C "$(@D)/$$dir" clean; \ + done diff --git a/docs/readme.txt b/docs/readme.txt index d6fa917..abfa673 100644 --- a/docs/readme.txt +++ b/docs/readme.txt @@ -377,7 +377,7 @@ IFACE_WAN=eth1 Запустить автоинсталятор бинариков. Он сам определит рабочую архитектуру и настроит все бинарики. /opt/zapret/install_bin.sh -АЛЬТЕРНАТИВА : зайти в tpws,nfq,ip2net,mdig, в каждом выполнить make. Получите динамические бинарики под вашу ось. +АЛЬТЕРНАТИВА : make -C /opt/zapret. Получите динамические бинарики под вашу ось. Для сборки требуются dev пакеты : zlib1g-dev libcap-dev libnetfilter-queue-dev Настроить параметры согласно разделу "Выбор параметров". diff --git a/install_bin.sh b/install_bin.sh index d3cc2cd..f4f7022 100755 --- a/install_bin.sh +++ b/install_bin.sh @@ -20,11 +20,12 @@ ccp() #cp -f "$BINDIR/$1" "$EXEDIR/$2" && echo copying : "$BINDIR/$1" =\> "$EXEDIR/$2" } -ARCHLIST="aarch64 armhf mips64r2-msb mips32r1-lsb mips32r1-msb ppc x86_64 x86" +ARCHLIST="my aarch64 armhf mips64r2-msb mips32r1-lsb mips32r1-msb ppc x86_64 x86" if [ "$1" = "getarch" ]; then for arch in $ARCHLIST do + [ -d "$BINDIR/$arch" ] || continue if check_dir $arch; then echo $arch exit 0 @@ -33,6 +34,7 @@ if [ "$1" = "getarch" ]; then else for arch in $ARCHLIST do + [ -d "$BINDIR/$arch" ] || continue if check_dir $arch; then echo $arch is OK echo installing binaries ... @@ -47,4 +49,4 @@ else done fi -false +exit 1 diff --git a/install_easy.sh b/install_easy.sh index a6d5b7f..045a464 100755 --- a/install_easy.sh +++ b/install_easy.sh @@ -87,7 +87,15 @@ call_install_bin() { "$EXEDIR/install_bin.sh" $1 || { echo binaries compatible with your system not found - exitp 8 + if exists make; then + echo trying to compile + make -C "$EXEDIR" || { + echo could not compile + exitp 8 + } + else + exitp 8 + fi } } get_bin_arch()