summaryrefslogtreecommitdiff
blob: ffed458e97e4ac81add1baddd32045cb9f4da586 (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
diff -Naur libextractor-0.5.0.orig/src/main/Makefile.am libextractor-0.5.0/src/main/Makefile.am
--- libextractor-0.5.0.orig/src/main/Makefile.am	2005-05-21 20:06:00.000000000 +0200
+++ libextractor-0.5.0/src/main/Makefile.am	2005-05-29 22:57:09.380579760 +0200
@@ -54,6 +54,8 @@
   getopt.h \
   getopt1.c 
 
+extract_LDFLAGS = -L./
+
 install-exec-local:
 	python libextractor_python_setup.py $(libdir) build
 	python libextractor_python_setup.py $(libdir) install --prefix=$(PYTHON_PREFIX)

--- libextractor-0.5.0/src/plugins/ole2/Makefile.am.orig	2005-04-23 02:16:51.000000000 +0200
+++ libextractor-0.5.0/src/plugins/ole2/Makefile.am	2005-05-29 22:44:03.497052216 +0200
@@ -24,7 +24,7 @@
   $(top_builddir)/src/main/libextractor.la
 # Ok, linking this one is complicated, see Mantis #787.
 libextractor_ole2_la_LDFLAGS = \
-  -Wl,-Bstatic -Wl,-lgobject-2.0 -Wl,-lglib-2.0 -Wl,-Bdynamic \
+  -Wl,-lgobject-2.0 -Wl,-lglib-2.0 -Wl,-Bdynamic \
   -Wl,-Bsymbolic -avoid-version -module
 # Note that we're NOT using PLUGINFLAGS here to avoid -export-dynamic!
 libextractor_ole2_la_SOURCES =  \

--- libextractor-0.5.0.orig/src/main/Makefile.am	2005-05-29 23:14:51.000000000 +0200
+++ libextractor-0.5.0/src/main/Makefile.am	2005-05-29 23:30:06.340036240 +0200
@@ -58,4 +58,4 @@
 
 install-exec-local:
 	python libextractor_python_setup.py $(libdir) build
-	python libextractor_python_setup.py $(libdir) install --prefix=$(PYTHON_PREFIX)
+	python libextractor_python_setup.py $(libdir) install --prefix=$(DESTDIR)$(PYTHON_PREFIX)

--- libextractor-0.5.0.orig/src/main/libextractor_python_setup.py	2005-05-13 00:45:03.000000000 +0200
+++ libextractor-0.5.0/src/main/libextractor_python_setup.py	2005-05-31 00:23:56.614163440 +0200
@@ -5,7 +5,6 @@
 sys.argv = sys.argv[1:]
 
 cmod = Extension("extractor",["libextractor_python.c"],
-                 libraries=["extractor"],
                  include_dirs=["../include"],
                  library_dirs=[path])