From 0ec05a10bebf94696f3408c58be76e61cf2714bd Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Wed, 1 Apr 2026 08:59:07 +0200
Subject: [PATCH] vpp: install missing include directory when installing from
 'vvp' directory

This fixes an issue unrelated to the addition of support for
versioned VVP library.
---
 configure.ac    | 5 +++++
 vvp/Makefile.in | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1c906fc58..cc817a69c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,6 +15,11 @@ AC_SUBST([LIBVVP_SOVERSION], [1])
 # setup libvvp version
 AC_SUBST([LIBVVP_VERSION], [VER_MAJOR.VER_MINOR])
 
+# setup libvvp soversion, which depends on abi not package version
+AC_SUBST([LIBVVP_SOVERSION], [1])
+# setup libvvp version
+AC_SUBST([LIBVVP_VERSION], [VER_MAJOR.VER_MINOR])
+
 AC_CONFIG_SRCDIR([netlist.h])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_HEADERS([_pli_types.h])
diff --git a/vvp/Makefile.in b/vvp/Makefile.in
index ccb1b3084..480eb205c 100644
--- a/vvp/Makefile.in
+++ b/vvp/Makefile.in
@@ -23,6 +23,7 @@ prefix = @prefix@
 exec_prefix = @exec_prefix@
 srcdir = @srcdir@
 datarootdir = @datarootdir@
+builddir = @builddir@
 
 VPATH = $(srcdir)
 
@@ -33,7 +34,7 @@ mandir = @mandir@
 # It is a little different from the generic includedir.
 includedir = @includedir@/iverilog$(suffix)
 pdfdir = @docdir@
-pkgconfigdir = @libdir@/pkgconfig
+pkgconfigdir = $(libdir)/pkgconfig
 
 # For a cross compile these defines will need to be set accordingly.
 HOSTCC = @CC@
@@ -117,7 +118,7 @@ else
 	rm -f vvp$(suffix).exe
 endif
 else
-	LD_LIBRARY_PATH=. ./vvp -M../vpi $(srcdir)/examples/hello.vvp | grep 'Hello, World.'
+	LD_LIBRARY_PATH=$(builddir) ./vvp -M../vpi $(srcdir)/examples/hello.vvp | grep 'Hello, World.'
 endif
 
 clean:
@@ -284,6 +285,7 @@ endif
 
 installdirs: $(srcdir)/../mkinstalldirs
 	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(bindir)" \
+		"$(DESTDIR)$(includedir)" \
 		"$(DESTDIR)$(libdir)" \
 		"$(DESTDIR)$(INSTALL_DOCDIR)" \
 		"$(DESTDIR)$(INSTALL_PDFDIR)"