From 0c5301a6dde28b22257415c74e0d1491228fafb6 Mon Sep 17 00:00:00 2001 From: lloyd Date: Wed, 7 Jan 2015 11:47:09 +0000 Subject: The pkgconfig file should be installed relative to the library dir rather than the base destdir. Pointed out by hexchain in github pull 38. Version the docdir with the full version incl patch. --- src/build-data/makefile/header.in | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src/build-data') diff --git a/src/build-data/makefile/header.in b/src/build-data/makefile/header.in index 970f75da4..d01b8a28a 100644 --- a/src/build-data/makefile/header.in +++ b/src/build-data/makefile/header.in @@ -24,14 +24,6 @@ BRANCH = %{version_major}.%{version_minor} LIBNAME = %{lib_prefix}botan-%{version_major}.%{version_minor} -# Installation Settings -DESTDIR = %{destdir} -BINDIR = $(DESTDIR)/bin -LIBDIR = $(DESTDIR)/%{libdir} -HEADERDIR = $(DESTDIR)/%{includedir}/botan-$(BRANCH)/botan -DOCDIR = $(DESTDIR)/%{docdir}/botan-$(VERSION) -PKGCONF_DIR = $(LIBDIR)/pkgconfig - # Executable targets APP = %{out_dir}/botan%{program_suffix} TEST = %{out_dir}/botan-test%{program_suffix} -- cgit v1.2.3