From 6cdda50fe9beb507cfec88f2bb36b7ddc1975d64 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 9 Jan 2013 18:00:47 +0100 Subject: move .pc file to libmsi/ directory --- Makefile.am | 3 --- configure.ac | 2 +- libmsi-1.0.pc.in | 11 ----------- libmsi/Makefile.am | 3 +++ libmsi/libmsi-1.0.pc.in | 11 +++++++++++ 5 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 libmsi-1.0.pc.in create mode 100644 libmsi/libmsi-1.0.pc.in diff --git a/Makefile.am b/Makefile.am index 7832032..d84f3ab 100644 --- a/Makefile.am +++ b/Makefile.am @@ -76,9 +76,6 @@ wixl_LDADD = \ wixl_DEPENDENCIES = libmsi/libmsi.la -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libmsi-1.0.pc - # Autotest support dist_noinst_DATA = tests/testsuite.at tests/package.m4 tests/testsuite diff --git a/configure.ac b/configure.ac index 123446e..fc930a1 100644 --- a/configure.ac +++ b/configure.ac @@ -67,9 +67,9 @@ AC_CONFIG_FILES([tests/package.m4.tmp:tests/package.m4.in], AC_CONFIG_FILES([ Makefile - libmsi-1.0.pc po/Makefile.in libmsi/Makefile + libmsi/libmsi-1.0.pc tests/Makefile ]) AC_OUTPUT diff --git a/libmsi-1.0.pc.in b/libmsi-1.0.pc.in deleted file mode 100644 index 5f93842..0000000 --- a/libmsi-1.0.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: libmsi-1.0 -Description: MSI manipulation library -Requires: gio-2.0 -Version: @PACKAGE_VERSION@ -Libs: -L${libdir} -lmsi -Cflags: -I${includedir}/ \ No newline at end of file diff --git a/libmsi/Makefile.am b/libmsi/Makefile.am index dadfac9..d470344 100644 --- a/libmsi/Makefile.am +++ b/libmsi/Makefile.am @@ -1,4 +1,7 @@ NULL = + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = libmsi-1.0.pc lib_LTLIBRARIES = libmsi.la AM_CPPFLAGS = -I$(top_srcdir)/include -I$(srcdir) -I. \ diff --git a/libmsi/libmsi-1.0.pc.in b/libmsi/libmsi-1.0.pc.in new file mode 100644 index 0000000..5f93842 --- /dev/null +++ b/libmsi/libmsi-1.0.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: libmsi-1.0 +Description: MSI manipulation library +Requires: gio-2.0 +Version: @PACKAGE_VERSION@ +Libs: -L${libdir} -lmsi +Cflags: -I${includedir}/ \ No newline at end of file -- cgit