From c946dbf3306e3eba6d7450473f3973afc9f7bc82 Mon Sep 17 00:00:00 2001 From: Norayr Chilingarian Date: Wed, 23 Feb 2022 03:41:46 +0400 Subject: [PATCH] should build on freebsd --- makefile | 16 ++++++++-------- makefile_freebsd | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/makefile b/makefile index 64b4bd2..3124d4a 100644 --- a/makefile +++ b/makefile @@ -17,10 +17,10 @@ all: deps #git submodule update mkdir -p $(build_dir_path) cd $(build_dir_path) - make -f $(mkfile_dir_path)/dps/lists/makefile BUILD=$(build_dir_path) - make -f $(mkfile_dir_path)/dps/Internet/makefile BUILD=$(build_dir_path) - make -f $(mkfile_dir_path)/dps/time/makefile BUILD=$(build_dir_path) - make -f $(mkfile_dir_path)/dps/opts/makefile BUILD=$(build_dir_path) + gmake -f $(mkfile_dir_path)/dps/lists/makefile BUILD=$(build_dir_path) + gmake -f $(mkfile_dir_path)/dps/Internet/makefile BUILD=$(build_dir_path) + gmake -f $(mkfile_dir_path)/dps/time/makefile BUILD=$(build_dir_path) + gmake -f $(mkfile_dir_path)/dps/opts/makefile BUILD=$(build_dir_path) cd $(build_dir_path) && \ $(VOC) -s \ ../src/vpkSettings.Mod \ @@ -45,10 +45,10 @@ all: deps deps: mkdir -p $(mkfile_dir_path)/$(DPS) cd $(mkfile_dir_path)/$(DPS) - test -d Internet && cd Internet; git pull || git clone https://github.com/norayr/Internet - test -d lists && cd lists; git pull || git clone https://github.com/norayr/lists - test -d opts && cd opts; git pull || git clone https://github.com/norayr/opts - test -d time && cd time; git pull || git clone https://github.com/norayr/time + if [ -d $(DPS)/Internet ]; then cd $(DPS)/Internet; git pull; cd -; else cd $(DPS); git clone https://github.com/norayr/Internet; cd -; fi + if [ -d $(DPS)/lists ]; then cd $(DPS)/lists; git pull; cd -; else cd $(DPS); git clone https://github.com/norayr/lists; cd -; fi + if [ -d $(DPS)/opts ]; then cd $(DPS)/opts; git pull; cd -; else cd $(DPS); git clone https://github.com/norayr/opts; cd -; fi + if [ -d $(DPS)/time ]; then cd $(DPS)/time; git pull; cd -; else cd $(DPS); git clone https://github.com/norayr/time; cd -; fi tests: mkdir -p $(mkfile_dir_path)/$(BLD) diff --git a/makefile_freebsd b/makefile_freebsd index d36f174..72b0c21 100644 --- a/makefile_freebsd +++ b/makefile_freebsd @@ -17,10 +17,10 @@ all: deps #git submodule update mkdir -p $(build_dir_path) cd $(build_dir_path) - make -f $(mkfile_dir_path)/dps/lists/makefile BUILD=$(build_dir_path) - make -f $(mkfile_dir_path)/dps/Internet/makefile BUILD=$(build_dir_path) - make -f $(mkfile_dir_path)/dps/time/makefile BUILD=$(build_dir_path) - make -f $(mkfile_dir_path)/dps/opts/makefile BUILD=$(build_dir_path) + gmake -f $(mkfile_dir_path)/dps/lists/makefile BUILD=$(build_dir_path) + gmake -f $(mkfile_dir_path)/dps/Internet/makefile BUILD=$(build_dir_path) + gmake -f $(mkfile_dir_path)/dps/time/makefile BUILD=$(build_dir_path) + gmake -f $(mkfile_dir_path)/dps/opts/makefile BUILD=$(build_dir_path) cd $(build_dir_path) && \ $(VOC) -s \ ../src/vpkSettings.Mod \ @@ -45,10 +45,10 @@ all: deps deps: mkdir -p $(mkfile_dir_path)/$(DPS) cd $(mkfile_dir_path)/$(DPS) - test -d Internet && cd Internet; git pull || git clone https://github.com/norayr/Internet - test -d lists && cd lists; git pull || git clone https://github.com/norayr/lists - test -d opts && cd opts; git pull || git clone https://github.com/norayr/opts - test -d time && cd time; git pull || git clone https://github.com/norayr/time + if [ -d $(DPS)/Internet ]; then cd $(DPS)/Internet; git pull; cd -; else cd $(DPS); git clone https://github.com/norayr/Internet; cd -; fi + if [ -d $(DPS)/lists ]; then cd $(DPS)/lists; git pull; cd -; else cd $(DPS); git clone https://github.com/norayr/lists; cd -; fi + if [ -d $(DPS)/opts ]; then cd $(DPS)/opts; git pull; cd -; else cd $(DPS); git clone https://github.com/norayr/opts; cd -; fi + if [ -d $(DPS)/time ]; then cd $(DPS)/time; git pull; cd -; else cd $(DPS); git clone https://github.com/norayr/time; cd -; fi tests: mkdir -p $(mkfile_dir_path)/$(BLD)