From 30022b114cd3e100dcc21b0f79fde526e7a9d281 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Thu, 2 Jan 2014 06:22:29 +0100 Subject: [PATCH 1/2] add and install pkgconfig file for the shared library --- libtomcrypt.pc | 10 ++++++++++ makefile.shared | 2 ++ 2 files changed, 12 insertions(+) create mode 100644 libtomcrypt.pc diff --git a/libtomcrypt.pc b/libtomcrypt.pc new file mode 100644 index 0000000..b8ff548 --- /dev/null +++ b/libtomcrypt.pc @@ -0,0 +1,10 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: LibTomCrypt +Description: public domain open source cryptographic toolkit +Version: 1.17 +Libs: -L${libdir} -ltomcrypt +Cflags: -I${includedir} diff --git a/makefile.shared b/makefile.shared index 7b8288a..4c7921e 100644 --- a/makefile.shared +++ b/makefile.shared @@ -270,6 +270,8 @@ install: $(LIBNAME) libtool --silent --mode=install install -c libtomcrypt.la $(DESTDIR)$(LIBPATH)/libtomcrypt.la install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(INCPATH) install -g $(GROUP) -o $(USER) $(HEADERS) $(DESTDIR)$(INCPATH) + install -d $(DESTDIR)$(LIBPATH)/pkgconfig + install -m 0644 -g $(GROUP) -o $(USER) libtomcrypt.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libtomcrypt.pc #This rule makes the hash program included with libtomcrypt hashsum: library From 90928d6dfd3c1e8a35530b55757e568c08845ccc Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Thu, 2 Jan 2014 07:09:24 +0100 Subject: [PATCH 2/2] pkgconfig: set libdir= to $LIBPATH (for multi-arch) --- libtomcrypt.pc => libtomcrypt.pc.in | 2 +- makefile.shared | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) rename libtomcrypt.pc => libtomcrypt.pc.in (88%) diff --git a/libtomcrypt.pc b/libtomcrypt.pc.in similarity index 88% rename from libtomcrypt.pc rename to libtomcrypt.pc.in index b8ff548..a0e889f 100644 --- a/libtomcrypt.pc +++ b/libtomcrypt.pc.in @@ -1,6 +1,6 @@ prefix=/usr exec_prefix=${prefix} -libdir=${exec_prefix}/lib +libdir=@LIBDIR@ includedir=${prefix}/include Name: LibTomCrypt diff --git a/makefile.shared b/makefile.shared index 4c7921e..d032a8c 100644 --- a/makefile.shared +++ b/makefile.shared @@ -271,6 +271,7 @@ install: $(LIBNAME) install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(INCPATH) install -g $(GROUP) -o $(USER) $(HEADERS) $(DESTDIR)$(INCPATH) install -d $(DESTDIR)$(LIBPATH)/pkgconfig + sed 's,@LIBDIR@,$(LIBPATH),g' libtomcrypt.pc.in > libtomcrypt.pc install -m 0644 -g $(GROUP) -o $(USER) libtomcrypt.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libtomcrypt.pc #This rule makes the hash program included with libtomcrypt