summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.cvsignore1
-rw-r--r--CHANGES2
-rw-r--r--Makefile.am5
-rwxr-xr-xconfigure.ac2
-rw-r--r--popt.pc.in10
-rw-r--r--popt.spec1
6 files changed, 19 insertions, 2 deletions
diff --git a/.cvsignore b/.cvsignore
index 892d8c3..2987312 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -40,4 +40,5 @@ test3
*.lcd
*.lo
*.swp
+popt.pc
popt-*.tar.gz
diff --git a/CHANGES b/CHANGES
index 8bebdaa..9b452f1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+1.15 -> 1.16:
+ - add popt.pc.
1.14 -> 1.15:
- release popt-1.15.
diff --git a/Makefile.am b/Makefile.am
index f6232fd..c21cf9c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,13 +42,16 @@ usrlib_LTLIBRARIES = libpopt.la
libpopt_la_SOURCES = popt.c poptparse.c poptconfig.c popthelp.c poptint.c
libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@ @LTLIBICONV@
+pkgconfigdir = $(prefix)/lib/pkgconfig
+pkgconfig_DATA = popt.pc
+
if HAVE_LD_VERSION_SCRIPT
libpopt_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libpopt.vers
endif
man_MANS = popt.3
-#BUILT_SOURCES = popt.lcd
+BUILT_SOURCES = popt.pc # popt.lcd
.PHONY: updatepo
updatepo:
diff --git a/configure.ac b/configure.ac
index 20e095e..f40cc0c 100755
--- a/configure.ac
+++ b/configure.ac
@@ -80,4 +80,4 @@ AC_DEFINE_UNQUOTED(POPT_SOURCE_PATH, "$POPT_SOURCE_PATH",
[Full path to popt top_srcdir.])
AC_SUBST(POPT_SOURCE_PATH)
-AC_OUTPUT([Doxyfile Makefile po/Makefile.in])
+AC_OUTPUT([Doxyfile Makefile popt.pc po/Makefile.in])
diff --git a/popt.pc.in b/popt.pc.in
new file mode 100644
index 0000000..43c1735
--- /dev/null
+++ b/popt.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: popt
+Version: @VERSION@
+Description: popt library.
+Libs: -L${libdir} -lpopt
+Cflags: -I${includedir}
diff --git a/popt.spec b/popt.spec
index 2ec54ba..066ec10 100644
--- a/popt.spec
+++ b/popt.spec
@@ -47,6 +47,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libpopt.*
%{_includedir}/popt.h
%{_mandir}/man3/popt.3*
+%{_prefix}/%{_lib}/pkgconfig/libpopt-%{version}.pc
%changelog
* Fri Apr 10 2009 Jeff Johnson <jbj@rpm5.org>