From ad868620daaed3f73d157ad594ce317a05ebe23d Mon Sep 17 00:00:00 2001 From: lloyd Date: Thu, 6 Nov 2008 23:44:56 +0000 Subject: Provide pkg-config file as botan-$major$minor.pc, so it can be used like: $ pkg-config botan-17 --libs -L/usr/local/lib -lbotan -lm -lpthread -lrt to make it easier to have multiple versions of Botan installed and in use at the same time. --- src/build-data/makefile/unix.in | 6 +++--- src/build-data/makefile/unix_shr.in | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/build-data/makefile') diff --git a/src/build-data/makefile/unix.in b/src/build-data/makefile/unix.in index 1355b7449..6df85e377 100644 --- a/src/build-data/makefile/unix.in +++ b/src/build-data/makefile/unix.in @@ -30,7 +30,7 @@ DOCDIR = $(DESTDIR)/@{var:docdir}/Botan-$(VERSION) PKGCONF_DIR = $(LIBDIR)/pkgconfig CONFIG_SCRIPT = @{var:botan-config} -PKGCONFIG = botan.pc +PKGCONFIG = @{var:botan-pkgconfig} ################################################## # Aliases for Common Programs # @@ -105,7 +105,7 @@ clean: distclean: clean $(RM_R) @{var:build-dir} $(RM_R) @{var:doc-dir}/doxygen @{var:doc-dir}/botan.doxy - $(RM) Makefile $(CONFIG_SCRIPT) botan.pc + $(RM) Makefile $(CONFIG_SCRIPT) $(PKGCONFIG) install: $(LIBRARIES) $(ECHO) "Installing Botan into $(DESTDIR)... " @@ -122,4 +122,4 @@ install: $(LIBRARIES) done $(INSTALL_CMD_DATA) $(STATIC_LIB) $(LIBDIR) $(INSTALL_CMD_EXEC) $(CONFIG_SCRIPT) $(BINDIR) - $(INSTALL_CMD_DATA) $(PKGCONFIG) $(PKGCONF_DIR) \ No newline at end of file + $(INSTALL_CMD_DATA) $(PKGCONFIG) $(PKGCONF_DIR) diff --git a/src/build-data/makefile/unix_shr.in b/src/build-data/makefile/unix_shr.in index 1a70fef99..b4076db49 100644 --- a/src/build-data/makefile/unix_shr.in +++ b/src/build-data/makefile/unix_shr.in @@ -32,7 +32,7 @@ DOCDIR = $(DESTDIR)/@{var:docdir}/Botan-$(VERSION) PKGCONF_DIR = $(LIBDIR)/pkgconfig CONFIG_SCRIPT = @{var:botan-config} -PKGCONFIG = botan.pc +PKGCONFIG = @{var:botan-pkgconfig} ################################################## # Aliases for Common Programs # @@ -118,7 +118,7 @@ clean: distclean: clean $(RM_R) @{var:build-dir} $(RM_R) @{var:doc-dir}/doxygen @{var:doc-dir}/botan.doxy - $(RM) Makefile $(CONFIG_SCRIPT) botan.pc + $(RM) Makefile $(CONFIG_SCRIPT) $(PKGCONFIG) install: $(LIBRARIES) $(ECHO) "Installing Botan into $(DESTDIR)... " -- cgit v1.2.3