diff options
| author | Daniel Gröber <dxld@darkboxed.org> | 2022-03-13 15:30:54 +0100 |
|---|---|---|
| committer | tgingold <tgingold@users.noreply.github.com> | 2022-03-14 07:59:51 +0100 |
| commit | 55e33158573e38a4c385ca705e26784176d9b508 (patch) | |
| tree | b5b1108554f45337cee893353d6b740414607572 /Makefile.in | |
| parent | 5015316150af384bd6d26136c43647f0e799cfc8 (diff) | |
| download | ghdl-55e33158573e38a4c385ca705e26784176d9b508.tar.gz ghdl-55e33158573e38a4c385ca705e26784176d9b508.tar.bz2 ghdl-55e33158573e38a4c385ca705e26784176d9b508.zip | |
Fix include-dir paths returned by cmdline _again_
--libghdl-include-dir should point at a directory containing a ghdl/
subdirectory while --vpi-include-dir should point right at the ghdl/
subdir.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index f99927395..12657beae 100644 --- a/Makefile.in +++ b/Makefile.in @@ -52,7 +52,7 @@ DESTDIR= bindir=$(prefix)/bin libdir=$(prefix)/$(libdirsuffix) libghdldir=$(prefix)/$(libghdldirsuffix) -incdir=$(prefix)/$(incdirsuffix) +incdir=$(prefix)/$(incdirsuffix)/ghdl MKDIR=mkdir LN=ln -s CP=cp @@ -470,6 +470,11 @@ install.libghdl.include: install.dirs $(srcdir)/src/synth/include/synth_gates.h $(INSTALL_DATA) -p $(srcdir)/src/synth/include/synth.h $(DESTDIR)$(incdir)/ $(INSTALL_DATA) -p $(srcdir)/src/synth/include/synth_gates.h $(DESTDIR)$(incdir)/ +test: install.libghdl.local +install.libghdl.local: all.libghdl + $(INSTALL_DATA) -p $(srcdir)/src/synth/include/synth.h $(DESTDIR)$(incdirsuffix)/ghdl + $(INSTALL_DATA) -p $(srcdir)/src/synth/include/synth_gates.h $(DESTDIR)$(incdirsuffix)/ghdl + install.libghdl.lib: $(INSTALL_PROGRAM) -p lib/$(libghdl_name) $(DESTDIR)$(libdir)/ $(INSTALL_PROGRAM) -p libghdl.a $(DESTDIR)$(libdir)/ @@ -567,8 +572,8 @@ uninstall.vpi: test: install.vpi.local install.vpi.local: all.vpi $(MKDIR) -p $(incdirsuffix) lib - $(INSTALL_DATA) -p $(GRTSRCDIR)/vpi_user.h $(incdirsuffix) - $(INSTALL_DATA) -p $(GRTSRCDIR)/vhpi_user.h $(incdirsuffix) + $(INSTALL_DATA) -p $(GRTSRCDIR)/vpi_user.h $(incdirsuffix)/ghdl/ + $(INSTALL_DATA) -p $(GRTSRCDIR)/vhpi_user.h $(incdirsuffix)/ghdl/ ################ Libraries ############################################### |