Commit 4c454c35 authored by Renaud Pacalet's avatar Renaud Pacalet

Minor bug fixes

parent 2a40e898
......@@ -65,7 +65,7 @@ ifeq ($(patsubst $(builddir)/%,,$(rootdir)),)
$(error The project working directory ($(rootdir)) seems to be a sub-directory of the build directory ($(builddir)). This is not supported.)
endif
# Verify that builddir is not the same or a parent directory of hdldir
ifeq ($(hdldir),$(rootdir))
ifeq ($(hdldir),$(builddir))
$(error The VHDL sources directory ($(hdldir)) seems to be the same as the build directory ($(builddir)). This is not supported.)
endif
ifeq ($(patsubst $(builddir)/%,,$(hdldir)),)
......@@ -136,6 +136,8 @@ ifeq ($(patsubst $(hdldir)/%,,$(rootdir)),)
__hwprj_temp_starting_point := $(hdldir)
else ifeq ($(patsubst $(rootdir)/%,,$(hdldir)),)
__hwprj_temp_starting_point := $(rootdir)
else ifeq ($(hdldir),$(rootdir))
__hwprj_temp_starting_point := $(hdldir)
else
__hwprj_temp_starting_point := $(rootdir) $(hdldir)
endif
......
......@@ -151,7 +151,7 @@ $(1).$(2): | .lock
flock .lock echo " read_vhdl -vhdl2008 -library $(1) $$(dst-$(1).$(2))" >> $$(vv-HELPER_SCRIPT).2008.npm && \
flock .lock echo " add_files $$(dst-$(1).$(2))" >> $$(vv-HELPER_SCRIPT).pm && \
flock .lock echo " set_property library $(1) [ get_files $$(dst-$(1).$(2)) ]" >> $$(vv-HELPER_SCRIPT).pm && \
flock .lock echo " read_vhdl -library $(1) $$(dst-$(1).$(2))" >> $$(vv-HELPER_SCRIPT).npm
flock .lock echo " read_vhdl -library $(1) $$(dst-$(1).$(2))" >> $$(vv-HELPER_SCRIPT).npm; \
fi
endef
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment