[Libguestfs] [hivex PATCH 4/8] build: move "hivex.pc.in" to the "lib" subdirectory

[Laszlo Ersek]

Bring hivex's worktree structure closer to libguestfs's, in preparation
for introducing "lib/local/hivex.pc.in" in a subsequent patch. Move
"hivex.pc.in" to the "lib" subdirectory.

Signed-off-by: Laszlo Ersek <lersek at redhat.com>
---
 configure.ac                   | 2 +-
 Makefile.am                    | 6 +-----
 lib/Makefile.am                | 8 ++++++++
 .gitignore                     | 2 +-
 hivex.pc.in => lib/hivex.pc.in | 0
 5 files changed, 11 insertions(+), 7 deletions(-)
 rename hivex.pc.in => lib/hivex.pc.in (100%)

diff --git a/configure.ac b/configure.ac
index 8adcb8512e66..3c79842ee5c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -570,10 +570,10 @@ AC_CONFIG_FILES([Makefile
                  generator/Makefile
                  gnulib/lib/Makefile
                  gnulib/tests/Makefile
-                 hivex.pc
                  images/Makefile
                  include/Makefile
                  lib/Makefile
+                 lib/hivex.pc
                  lib/tools/Makefile
                  ocaml/Makefile ocaml/META
                  perl/Makefile perl/Makefile.PL
diff --git a/Makefile.am b/Makefile.am
index f69d8cfb8e67..221eebb75298 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,7 +52,7 @@ if ALWAYS_FALSE
 SUBDIRS += extra-tests
 endif
 
-EXTRA_DIST = hivex.pc.in LICENSE README run.in \
+EXTRA_DIST = LICENSE README run.in \
 	po/zanata-pull.sh po/zanata.xml
 
 # Generate the ChangeLog automatically from the gitlog.
@@ -60,10 +60,6 @@ dist-hook:
 	$(top_srcdir)/build-aux/gitlog-to-changelog > ChangeLog
 	cp ChangeLog $(distdir)/ChangeLog
 
-# Pkgconfig.
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = hivex.pc
-
 # Maintainer website update.
 HTMLFILES = \
 	html/hivex.3.html \
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 9bdf494c7742..581a0112d8df 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -18,6 +18,7 @@
 SUBDIRS = tools
 
 EXTRA_DIST = \
+	hivex.pc.in \
 	hivex.pod \
 	hivex.syms
 
@@ -52,6 +53,13 @@ libhivex_la_CPPFLAGS = \
   -I$(top_builddir)/gnulib/lib \
   -I$(srcdir)
 
+# Pkgconfig.
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = hivex.pc
+
+# Manual page.
+
 man_MANS = hivex.3
 
 hivex.3: hivex.pod
diff --git a/.gitignore b/.gitignore
index af256d59030e..10154711f56c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,7 +44,6 @@ Makefile.in
 /generator/stamp-generator
 /GNUmakefile
 /gnulib
-/hivex.pc
 /hivex-*.tar.gz
 /html/hivex.3.html
 /html/hivexget.1.html
@@ -56,6 +55,7 @@ Makefile.in
 /include/hivex.h
 /install-sh
 /lib/*.3
+/lib/hivex.pc
 /lib/hivex.pod
 /lib/hivex.syms
 /lib/test-just-header
diff --git a/hivex.pc.in b/lib/hivex.pc.in
similarity index 100%
rename from hivex.pc.in
rename to lib/hivex.pc.in
-- 
2.19.1.3.g30247aa5d201