From 0748aa4b46d488bd0758dcde9ce077ac25ca9cc2 Mon Sep 17 00:00:00 2001
From: Abhinay Kayastha <abhinay.kayastha@sifive.com>
Date: Tue, 29 Sep 2020 13:08:18 -0700
Subject: [PATCH] Partially revert removal of .pc.in files; add disasm.pc.in

---
 configure           |  3 +++
 configure.ac        |  1 +
 disasm/disasm.mk.in |  4 +++-
 riscv-disasm.pc.in  | 11 +++++++++++
 4 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 riscv-disasm.pc.in

diff --git a/configure b/configure
index d7bbecb7..7b9da7e8 100755
--- a/configure
+++ b/configure
@@ -5264,6 +5264,8 @@ ac_config_files="$ac_config_files Makefile"
 
 ac_config_files="$ac_config_files riscv-fesvr.pc"
 
+ac_config_files="$ac_config_files riscv-disasm.pc"
+
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -5966,6 +5968,7 @@ do
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "riscv-fesvr.pc") CONFIG_FILES="$CONFIG_FILES riscv-fesvr.pc" ;;
+    "riscv-disasm.pc") CONFIG_FILES="$CONFIG_FILES riscv-disasm.pc" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
diff --git a/configure.ac b/configure.ac
index 82052399..b7788b4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -116,4 +116,5 @@ MCPPBS_SUBPROJECTS([ fesvr, riscv, disasm, customext, fdt, softfloat, spike_main
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([riscv-fesvr.pc])
+AC_CONFIG_FILES([riscv-disasm.pc])
 AC_OUTPUT
diff --git a/disasm/disasm.mk.in b/disasm/disasm.mk.in
index 6f1ed2ac..039a717f 100644
--- a/disasm/disasm.mk.in
+++ b/disasm/disasm.mk.in
@@ -2,4 +2,6 @@ disasm_CFLAGS = -fPIC
 
 disasm_srcs = \
   disasm.cc \
-	regnames.cc \
+  regnames.cc \
+
+disasm_install_lib = yes
diff --git a/riscv-disasm.pc.in b/riscv-disasm.pc.in
new file mode 100644
index 00000000..8e022e93
--- /dev/null
+++ b/riscv-disasm.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@prefix@
+libdir=${prefix}/@libdir@
+includedir=${prefix}/@includedir@
+
+Name: riscv-disasm
+Description: RISC-V disassembler
+Version: git
+Libs: -Wl,-rpath,${libdir} -L${libdir} -ldisasm
+Cflags: -I${includedir} 
+URL: http://riscv.org/download.html#tab_disasm