diff options
| -rw-r--r-- | lib/subdir.am | 2 | ||||
| -rw-r--r-- | tests/isisd/subdir.am | 2 | ||||
| -rw-r--r-- | tests/lib/subdir.am | 2 | ||||
| -rw-r--r-- | vtysh/subdir.am | 2 | ||||
| -rw-r--r-- | yang/embedmodel.py | 4 |
5 files changed, 8 insertions, 4 deletions
diff --git a/lib/subdir.am b/lib/subdir.am index 754a7da638..18e9825a7a 100644 --- a/lib/subdir.am +++ b/lib/subdir.am @@ -567,6 +567,7 @@ rt_enabled += --enabled zebra endif lib/route_types.h: $(top_srcdir)/lib/route_types.txt $(top_srcdir)/lib/route_types.pl + @$(MKDIR_P) lib $(PERL) $(top_srcdir)/lib/route_types.pl $(rt_enabled) < $(top_srcdir)/lib/route_types.txt > $@ DISTCLEANFILES += lib/route_types.h @@ -581,6 +582,7 @@ PHONY_GITVERSION=lib/gitversion.h.tmp .SILENT: lib/gitversion.h lib/gitversion.h.tmp GITH=lib/gitversion.h lib/gitversion.h.tmp: $(top_srcdir)/.git + @$(MKDIR_P) lib $(PERL) $(top_srcdir)/lib/gitversion.pl $(top_srcdir) > ${GITH}.tmp lib/gitversion.h: lib/gitversion.h.tmp { test -f ${GITH} && diff -s -q ${GITH}.tmp ${GITH}; } || cp ${GITH}.tmp ${GITH} diff --git a/tests/isisd/subdir.am b/tests/isisd/subdir.am index 2f9ce81f16..5adc162fea 100644 --- a/tests/isisd/subdir.am +++ b/tests/isisd/subdir.am @@ -21,7 +21,7 @@ EXTRA_DIST += \ # end tests/isisd/test_fuzz_isis_tlv_tests.h: $(top_srcdir)/tests/isisd/test_fuzz_isis_tlv_tests.h.gz - @mkdir -p tests/isisd + @$(MKDIR_P) tests/isisd $(AM_V_GEN)gzip -d < $(top_srcdir)/tests/isisd/test_fuzz_isis_tlv_tests.h.gz > "$@" CLEANFILES += tests/isisd/test_fuzz_isis_tlv_tests.h diff --git a/tests/lib/subdir.am b/tests/lib/subdir.am index 62b194439f..1bc092a49e 100644 --- a/tests/lib/subdir.am +++ b/tests/lib/subdir.am @@ -93,7 +93,7 @@ tests_lib_cli_test_commands_LDADD = $(ALL_TESTS_LDADD) nodist_tests_lib_cli_test_commands_SOURCES = tests/lib/cli/test_commands_defun.c tests_lib_cli_test_commands_SOURCES = tests/lib/cli/test_commands.c tests/helpers/c/prng.c tests/lib/cli/test_commands_defun.c: vtysh/vtysh_cmd.c - @mkdir -p tests/lib/cli + @$(MKDIR_P) tests/lib/cli $(AM_V_GEN)sed \ -e 's%"vtysh/vtysh\.h"%"tests/helpers/c/tests.h"%' \ -e 's/vtysh_init_cmd/test_init_cmd/' \ diff --git a/vtysh/subdir.am b/vtysh/subdir.am index 72204201d9..a1b81f598a 100644 --- a/vtysh/subdir.am +++ b/vtysh/subdir.am @@ -37,5 +37,5 @@ $(vtysh_vtysh_OBJECTS): vtysh/vtysh_daemons.h CLEANFILES += vtysh/vtysh_daemons.h vtysh/vtysh_daemons.h: - mkdir -p vtysh + @$(MKDIR_P) vtysh $(PERL) $(top_srcdir)/vtysh/daemons.pl $(vtysh_daemons) > vtysh/vtysh_daemons.h diff --git a/yang/embedmodel.py b/yang/embedmodel.py index a77a81363f..c532973d7c 100644 --- a/yang/embedmodel.py +++ b/yang/embedmodel.py @@ -12,8 +12,10 @@ inname = sys.argv[1] outname = sys.argv[2] outdir = os.path.dirname(os.path.abspath(outname)) -if not os.path.isdir(outdir): +try: os.makedirs(outdir) +except FileExistsError: + pass # these are regexes to avoid a compile-time/host dependency on yang-tools # or python-yang. Cross-compiling FRR is already somewhat involved, no need |