SHA256
1
0
forked from pool/Botan
Botan/Botan-fix_install_paths.patch

62 lines
2.4 KiB
Diff
Raw Normal View History

Index: src/build-data/makefile/unix.in
===================================================================
--- src/build-data/makefile/unix.in.orig 2011-06-21 17:33:59.550471797 +0200
+++ src/build-data/makefile/unix.in 2011-06-21 17:35:52.643901474 +0200
@@ -12,12 +12,12 @@ VERSION = %{version}
SERIES = %{version_major}.%{version_minor}
# Installation Settings
-DESTDIR = %{prefix}
+DESTDIR =
-BINDIR = $(DESTDIR)/bin
-LIBDIR = $(DESTDIR)/%{libdir}
-HEADERDIR = $(DESTDIR)/%{includedir}/botan-$(SERIES)/botan
-DOCDIR = $(DESTDIR)/%{docdir}/botan-$(VERSION)
+BINDIR = $(DESTDIR)%{prefix}/bin
+LIBDIR = $(DESTDIR)%{libdir}
+HEADERDIR = $(DESTDIR)%{includedir}/botan-$(SERIES)/botan
+DOCDIR = $(DESTDIR)%{docdir}/Botan-$(VERSION)
PKGCONF_DIR = $(LIBDIR)/pkgconfig
CONFIG_SCRIPT = %{botan_config}
Index: src/build-data/makefile/unix_shr.in
===================================================================
--- src/build-data/makefile/unix_shr.in.orig 2011-06-21 17:33:59.550471797 +0200
+++ src/build-data/makefile/unix_shr.in 2011-06-21 17:35:50.812926900 +0200
@@ -14,12 +14,12 @@ VERSION = %{version}
SERIES = %{version_major}.%{version_minor}
# Installation Settings
-DESTDIR = %{prefix}
+DESTDIR =
-BINDIR = $(DESTDIR)/bin
-LIBDIR = $(DESTDIR)/%{libdir}
-HEADERDIR = $(DESTDIR)/%{includedir}/botan-$(SERIES)/botan
-DOCDIR = $(DESTDIR)/%{docdir}/botan-$(VERSION)
+BINDIR = $(DESTDIR)%{prefix}/bin
+LIBDIR = $(DESTDIR)%{libdir}
+HEADERDIR = $(DESTDIR)%{includedir}/botan-$(SERIES)/botan
+DOCDIR = $(DESTDIR)%{docdir}/Botan-$(VERSION)
PKGCONF_DIR = $(LIBDIR)/pkgconfig
CONFIG_SCRIPT = %{botan_config}
--- src/build-data/botan-config.in.orig 2016-05-13 00:45:07.618245779 +0200
+++ src/build-data/botan-config.in 2016-05-13 00:45:38.386439746 +0200
@@ -32,12 +32,12 @@ while test $# -gt 0; do
exit 0
;;
--cflags)
- echo -I$prefix/$includedir
+ echo -I$includedir
;;
--libs)
if [ $prefix != "/usr" ]
then
- echo -L$prefix/$libdir -lbotan-%{version_major}.%{version_minor} %{link_to}
+ echo -L$libdir -lbotan-%{version_major}.%{version_minor} %{link_to}
else
echo -lbotan-%{version_major}.%{version_minor} %{link_to}
fi