git.annexia.org
/
libguestfs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3819b65
)
Ubuntu: Fix compilation of virt-resize if old libguestfs already installed.
author
Richard W.M. Jones
<rjones@redhat.com>
Sat, 4 Jun 2011 12:13:11 +0000
(13:13 +0100)
committer
Richard W.M. Jones
<rjones@redhat.com>
Sat, 4 Jun 2011 12:13:11 +0000
(13:13 +0100)
resize/Makefile.am
patch
|
blob
|
history
diff --git
a/resize/Makefile.am
b/resize/Makefile.am
index
f3e6aff
..
8418cb4
100644
(file)
--- a/
resize/Makefile.am
+++ b/
resize/Makefile.am
@@
-41,7
+41,11
@@
OBJECTS = \
bin_SCRIPTS = virt-resize
-OCAMLPACKAGES = -package pcre -I ../ocaml
+# -I $(top_builddir)/src/.libs is a hack which forces corresponding -L
+# option to be passed to gcc, so we don't try linking against an
+# installed copy of libguestfs.
+OCAMLPACKAGES = -package pcre -I $(top_builddir)/src/.libs -I ../ocaml
+
OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX $(OCAMLPACKAGES)
OCAMLOPTFLAGS = $(OCAMLCFLAGS)