From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Sun, 16 Mar 2014 21:13:45 +0000 (+0100)
Subject: Revert "Stop using -rpath when linking libmovit."
X-Git-Tag: 1.0.1~2
X-Git-Url: https://git.sesse.net/?p=movit;a=commitdiff_plain;h=c416ac9e99ad6caa9585d29723afe07ff8991648

Revert "Stop using -rpath when linking libmovit."

Actually, this is seemingly needed to build shared libraries at all. Doh.

This reverts commit 05466cbaae2befac3d3ab8bbba614bc08646d3f2.
---

diff --git a/Makefile.in b/Makefile.in
index 76929cd..c056039 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -112,7 +112,7 @@ demo: libmovit.la $(DEMO_OBJS)
 
 # The library itself.
 libmovit.la: $(LIB_OBJS:.o=.lo)
-	$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -version-info $(movit_ltversion) -o $@ $^ $(LDLIBS)
+	$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -rpath $(libdir) -version-info $(movit_ltversion) -o $@ $^ $(LDLIBS)
 
 %.lo: %.cpp
 	$(LIBTOOL) --mode=compile $(CXX) -MMD -MP $(CPPFLAGS) $(CXXFLAGS) -o $@ -c $<