blob: ad01230d8b8a87dfcfc2bcccc9d52d6c124c87ac (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
|
Author: "P. J. McDermott" <pj@pehjota.net>
Subject: Fix install directories
diff -Naur src.orig/configure src/configure
--- src.orig/configure 2014-05-19 09:44:03.000000000 -0400
+++ src/configure 2014-06-21 22:48:30.030613752 -0400
@@ -18792,7 +18792,7 @@
toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
toolexeclibdir='$(libdir)'
fi
- multi_os_directory=`$CC $CFLAGS -print-multi-os-directory`
+ multi_os_directory=.
case $multi_os_directory in
.) ;; # Avoid trailing /.
../*) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
diff -Naur src.orig/configure.ac src/configure.ac
--- src.orig/configure.ac 2014-05-11 09:57:49.000000000 -0400
+++ src/configure.ac 2014-06-21 22:48:27.786546119 -0400
@@ -596,7 +596,7 @@
toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
toolexeclibdir='$(libdir)'
fi
- multi_os_directory=`$CC $CFLAGS -print-multi-os-directory`
+ multi_os_directory=.
case $multi_os_directory in
.) ;; # Avoid trailing /.
../*) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
diff -Naur src.orig/include/Makefile.am src/include/Makefile.am
--- src.orig/include/Makefile.am 2014-04-25 13:45:13.000000000 -0400
+++ src/include/Makefile.am 2014-06-21 22:38:34.828683146 -0400
@@ -5,5 +5,5 @@
DISTCLEANFILES=ffitarget.h
EXTRA_DIST=ffi.h.in ffi_common.h
-includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
+includesdir = $(includedir)
nodist_includes_HEADERS = ffi.h ffitarget.h
diff -Naur src.orig/include/Makefile.in src/include/Makefile.in
--- src.orig/include/Makefile.in 2014-05-19 09:44:04.000000000 -0400
+++ src/include/Makefile.in 2014-06-21 22:38:37.180753970 -0400
@@ -314,7 +314,7 @@
AUTOMAKE_OPTIONS = foreign
DISTCLEANFILES = ffitarget.h
EXTRA_DIST = ffi.h.in ffi_common.h
-includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
+includesdir = $(includedir)
nodist_includes_HEADERS = ffi.h ffitarget.h
all: all-am
diff -Naur src.orig/libffi.pc.in src/libffi.pc.in
--- src.orig/libffi.pc.in 2014-04-25 13:45:13.000000000 -0400
+++ src/libffi.pc.in 2014-06-21 22:57:05.594174611 -0400
@@ -1,11 +1,5 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-toolexeclibdir=@toolexeclibdir@
-includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
-
Name: @PACKAGE_NAME@
Description: Library supporting Foreign Function Interfaces
Version: @PACKAGE_VERSION@
-Libs: -L${toolexeclibdir} -lffi
-Cflags: -I${includedir}
+Libs: -lffi
+Cflags:
|
