summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2011-06-04 13:13:11 +0100
committerRichard W.M. Jones <rjones@redhat.com>2011-06-04 13:13:11 +0100
commit418842518bf856144e2ab33abb6de417d1b60753 (patch)
tree7c914a35816b1b88033ee2f22e019799e50cefce
parent3819b657b0e3cc7cf99d04fc1f7bced8269e6ce9 (diff)
downloadlibguestfs-418842518bf856144e2ab33abb6de417d1b60753.tar.gz
libguestfs-418842518bf856144e2ab33abb6de417d1b60753.tar.xz
libguestfs-418842518bf856144e2ab33abb6de417d1b60753.zip
Ubuntu: Fix compilation of virt-resize if old libguestfs already installed.
-rw-r--r--resize/Makefile.am6
1 files changed, 5 insertions, 1 deletions
diff --git a/resize/Makefile.am b/resize/Makefile.am
index f3e6aff6..8418cb47 100644
--- 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)