]>
Commit | Line | Data |
---|---|---|
9d11b5b6 AM |
1 | diff -Nur fontforge-20090224.orig/configure fontforge-20090224/configure |
2 | --- fontforge-20090224.orig/configure 2008-12-24 14:04:18.000000000 -0700 | |
3 | +++ fontforge-20090224/configure 2009-04-01 22:56:07.000000000 -0600 | |
4 | @@ -26670,6 +26670,7 @@ | |
5 | else | |
6 | PYLIBS="" | |
7 | fi | |
8 | + PYDEFINES="$PYDEFINES, ('SOLIBDIR','\"$libdir/\"')" | |
9 | PY=pyhook/setup.py | |
10 | fi | |
11 | ||
12 | diff -Nur fontforge-20090224.orig/pyhook/loadfontforge.h fontforge-20090224/pyhook/loadfontforge.h | |
13 | --- fontforge-20090224.orig/pyhook/loadfontforge.h 2007-12-23 19:28:35.000000000 -0700 | |
14 | +++ fontforge-20090224/pyhook/loadfontforge.h 2009-04-01 22:49:08.000000000 -0600 | |
15 | @@ -11,7 +11,7 @@ | |
16 | ||
17 | if ( (lib = dlopen("libgunicode" SO_EXT,RTLD_LAZY))==NULL ) { | |
18 | #ifdef PREFIX | |
19 | - lib = dlopen( PREFIX "/lib/" "libgunicode" SO_EXT,RTLD_LAZY); | |
20 | + lib = dlopen( SOLIBDIR "libgunicode.so.3" ,RTLD_LAZY); | |
21 | #endif | |
22 | } | |
23 | if ( lib==NULL ) { | |
24 | @@ -21,7 +21,7 @@ | |
25 | ||
26 | if ( (lib = dlopen("libgutils" SO_EXT,RTLD_LAZY))==NULL ) { | |
27 | #ifdef PREFIX | |
28 | - lib = dlopen( PREFIX "/lib/" "libgutils" SO_EXT,RTLD_LAZY); | |
29 | + lib = dlopen( SOLIBDIR "libgutils.so.1" ,RTLD_LAZY); | |
30 | #endif | |
31 | } | |
32 | if ( lib==NULL ) { | |
33 | @@ -31,7 +31,7 @@ | |
34 | ||
35 | if ( (lib = dlopen("libfontforge" SO_EXT,RTLD_LAZY))==NULL ) { | |
36 | #ifdef PREFIX | |
37 | - lib = dlopen( PREFIX "/lib/" "libfontforge" SO_EXT,RTLD_LAZY); | |
38 | + lib = dlopen( SOLIBDIR "libfontforge.so.1" ,RTLD_LAZY); | |
39 | #endif | |
40 | } | |
41 | if ( lib==NULL ) { |