diff --git a/src/Makefile.in b/src/Makefile.in index a49e500a..86726fed 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -20,7 +20,7 @@ all: configure mk/sysconf ${MAKE} -C lib ${MAKE} -C index depend recollindex @NOQTMAKE@(cd $(QTGUI); ${QMAKE} recoll.pro) - @NOQTMAKE@${MAKE} -C $(QTGUI) depth=.. prefix=$(prefix) exec_prefix=$(exec_prefix) libdir=$(libdir) + @NOQTMAKE@${MAKE} -C $(QTGUI) LFLAGS="$(LDFLAGS)" depth=.. prefix=$(prefix) exec_prefix=$(exec_prefix) libdir=$(libdir) @NOPYTHON@${MAKE} -C python/recoll libdir=$(libdir) ${MAKE} -C query recollq xadump diff --git a/src/index/Makefile b/src/index/Makefile index e30e4caa..f6b4e7e1 100644 --- a/src/index/Makefile +++ b/src/index/Makefile @@ -8,7 +8,7 @@ all: depend librecoll $(PROGS) RECOLLINDEX_OBJS= recollindex.o rclmonrcv.o rclmonprc.o recollindex : $(RECOLLINDEX_OBJS) - $(CXX) $(ALL_CXXFLAGS) $(RECOLL_LDFLAGS) -o recollindex \ + $(CXX) $(ALL_CXXFLAGS) $(RECOLL_LDFLAGS) $(LDFLAGS) -o recollindex \ $(RECOLLINDEX_OBJS) \ $(BSTATIC) $(LIBRECOLL) $(LIBXAPIAN) $(LIBXAPIANSTATICEXTRA) \ $(LIBICONV) $(BDYNAMIC) \ diff --git a/src/lib/mkMake.in b/src/lib/mkMake.in index 7c803e62..f372a8ef 100755 --- a/src/lib/mkMake.in +++ b/src/lib/mkMake.in @@ -145,7 +145,7 @@ librecoll.a : \$(DEPS) \$(OBJS) # programs or modules from the same Recoll release can be compatible. \$(LIBRECOLL): \$(DEPS) \$(OBJS) \$(CXX) -shared -Wl,--no-undefined -Wl,--warn-unresolved-symbols \ - -Wl,-soname=\$(LIBRECOLL) -o \$(LIBRECOLL) \$(OBJS) \ + \$(LDFLAGS) -Wl,-soname=\$(LIBRECOLL) -o \$(LIBRECOLL) \$(OBJS) \ \$(LIBXAPIAN) \$(LIBICONV) \$(X_LIBX11) \$(LIBSYS) rm -f librecoll.so ln -s \$(LIBRECOLL) librecoll.so