Make $(libdir) on make install, in case it does not exist.

[movit] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index e5f8ac96000739d039a7ab67422cf32a0e26650f..fa2556964eed1de541ef16e30a2038244a95a215 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -6,8 +6,8 @@ GTEST_DIR ?= /usr/src/gtest
 # strive towards having a rock-stable ABI, but at least the soversion will increase
 # whenever it breaks, so that you will not have silent failures, and distribution package
 # management can run its course.
-movit_ltversion = 1:0:0
-movit_version = 1.0
+movit_ltversion = 1:1:0
+movit_version = 1.0.1
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
@@ -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 $<
@@ -170,16 +170,17 @@ MISSING_SHADERS += fft_convolution_effect.frag fft_input.frag
 SHADERS := $(filter-out $(MISSING_SHADERS),$(SHADERS))
 
 install: libmovit.la
-       $(LIBTOOL) --mode=install $(INSTALL) -m 0644 libmovit.la $(libdir)/
-       $(MKDIR) -p $(includedir)/movit/
-       $(INSTALL) -m 0644 $(HDRS) $(includedir)/movit/
-       $(MKDIR) -p $(datadir)/movit/
-       $(INSTALL) -m 0644 $(SHADERS) $(datadir)/movit/
-       $(MKDIR) -p $(libdir)/pkgconfig/
-       $(INSTALL) -m 644 movit.pc $(libdir)/pkgconfig/
+       $(MKDIR) -p $(DESTDIR)$(libdir)/
+       $(LIBTOOL) --mode=install $(INSTALL) -m 0644 libmovit.la $(DESTDIR)$(libdir)/
+       $(MKDIR) -p $(DESTDIR)$(includedir)/movit/
+       $(INSTALL) -m 0644 $(HDRS) $(DESTDIR)$(includedir)/movit/
+       $(MKDIR) -p $(DESTDIR)$(datadir)/movit/
+       $(INSTALL) -m 0644 $(SHADERS) $(DESTDIR)$(datadir)/movit/
+       $(MKDIR) -p $(DESTDIR)$(libdir)/pkgconfig/
+       $(INSTALL) -m 644 movit.pc $(DESTDIR)$(libdir)/pkgconfig/
 
 DISTDIR=movit-$(movit_version)
-OTHER_DIST_FILES=add.frag autogen.sh blue.frag configure.ac d65.h effectlist.txt identity.frag invert_effect.frag Makefile.in mipmap_needing_effect.frag movit.pc.in README test_util.h widgets.h
+OTHER_DIST_FILES=add.frag autogen.sh blue.frag configure.ac d65.h effectlist.txt identity.frag invert_effect.frag Makefile.in mipmap_needing_effect.frag movit.pc.in README NEWS test_util.h widgets.h
 
 dist:
        $(MKDIR) $(DISTDIR)