Sophie

Sophie

distrib > Mandriva > current > i586 > media > contrib-release-src > by-pkgid > 4e833035e3c69b659d42488c18b4fbc1 > files > 1

recoll-1.13.02-2mdv2010.1.src.rpm

diff -Naur recoll-1.12.4/Makefile.in recoll-1.12.4.tpg/Makefile.in
--- recoll-1.12.4/Makefile.in	2009-11-16 11:47:41.000000000 +0000
+++ recoll-1.12.4.tpg/Makefile.in	2009-12-15 00:20:09.000000000 +0000
@@ -14,7 +14,7 @@
 all: mk/sysconf common/rclversion.h
 	cd lib; ${MAKE}
 	cd index; ${MAKE} recollindex
-	@NOQTMAKE@cd $(QTGUI); ${QMAKE} recoll.pro; ${MAKE} depth=.. 
+	@NOQTMAKE@cd $(QTGUI); ${QMAKE} QMAKE_CFLAGS="${CXXFLAGS}" QMAKE_CXXLAGS="${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" recoll.pro; ${MAKE} depth=..
 	@NOCMDLINE@ cd query; ${MAKE} recollq
 
 mk/sysconf:
diff -Naur recoll-1.12.4/index/Makefile recoll-1.12.4.tpg/index/Makefile
--- recoll-1.12.4/index/Makefile	2009-11-16 12:29:43.000000000 +0000
+++ recoll-1.12.4.tpg/index/Makefile	2009-12-15 00:17:44.000000000 +0000
@@ -8,7 +8,7 @@
 
 RECOLLINDEX_OBJS= recollindex.o rclmonrcv.o rclmonprc.o $(BIGLIB) 
 recollindex : $(RECOLLINDEX_OBJS)
-	$(CXX) $(ALL_CXXFLAGS) -o recollindex $(RECOLLINDEX_OBJS) \
+	$(CXX) $(LDFLAGS) $(ALL_CXXFLAGS) -o recollindex $(RECOLLINDEX_OBJS) \
 	       $(BSTATIC) $(LIBXAPIAN) $(LIBICONV) $(BDYNAMIC) \
 	       $(LIBFAM) \
 	       $(X_LIBS) $(X_PRE_LIBS) $(X_LIBX11) $(X_EXTRA_LIBS) \
diff -Naur recoll-1.12.4/mk/localdefs.in recoll-1.12.4.tpg/mk/localdefs.in
--- recoll-1.12.4/mk/localdefs.in	2009-11-16 12:29:26.000000000 +0000
+++ recoll-1.12.4.tpg/mk/localdefs.in	2009-12-15 00:20:49.000000000 +0000
@@ -31,3 +31,4 @@
 	      @DEFS@
 
 CXXFLAGS = @CXXFLAGS@
+LDFLAGS = @LDFLAGS@