Move libfl.pc.in to src subdirectory.

diff --git a/.gitignore b/.gitignore
index 53d0c18a1b9eab2c8e12f807b13c3ed566d60262..e92979c2bb1e894ede703b93364a86b1b23d7f45 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -20,7 +20,6 @@ config.status
 configure
 configure.scan
 flex-*/
-libfl.pc
 libtool
 m4/
 stamp-*

diff --git a/Makefile.am b/Makefile.am
index e790e9d36c7e67fede12f2cba20ff67b7df1a7aa..638c54964f01cf781db6d756993925a7b45ef3c1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -49,9 +49,6 @@ SUBDIRS = \
        tests \
        tools
 
-pkgconfigdir = @pkgconfigdir@
-pkgconfig_DATA = libfl.pc
-
 # Create the ChangeLog, but only if we're inside a git working directory
 
 ChangeLog: $(srcdir)/tools/git2cl

diff --git a/configure.ac b/configure.ac
index 88820165303eba9e3f1213880fcc9d4963ca6d4f..c6f12d6447148fc2e3ece35cebe3afe46b4f03ba 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -180,10 +180,10 @@ examples/Makefile
 examples/fastwc/Makefile
 examples/manual/Makefile
 po/Makefile.in
+src/libfl.pc
 src/Makefile
 tools/Makefile
 tests/Makefile
-libfl.pc
 )
 
 AC_OUTPUT

diff --git a/src/.gitignore b/src/.gitignore
index 1daa9f827dd8877096c65e937b8f395b006f03dd..7f35139c025bd8e72bca914110ce2c7fc26836de 100644 (file)
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -4,6 +4,7 @@
 config.h
 config.h.in
 flex
+libfl.pc
 parse.c
 parse.h
 scan.c

diff --git a/src/Makefile.am b/src/Makefile.am
index 0d13a5af1224fff4189def82aa040970a1d17a30..2181127686e8af5a8ae5a3764e6364d16cdbf99d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,6 +9,9 @@ if ENABLE_BOOTSTRAP
 noinst_PROGRAMS = stage1flex
 endif
 
+pkgconfigdir = @pkgconfigdir@
+pkgconfig_DATA = libfl.pc
+
 if ENABLE_LIBFL
 lib_LTLIBRARIES = libfl.la
 endif

diff --git a/libfl.pc.in b/src/libfl.pc.in
similarity index 100%
rename from libfl.pc.in
rename to src/libfl.pc.in