[patch] fix the --disable_cbpoll issue

01-configure-fix-disable-cbpoll.patch (text/plain), 2.07 KB, created by Hugo Mildenberger on 2009-12-07 19:42:32 UTC

# this patch fixes the --disable_poll configure switch. A stray temporary 
# file named "tmp.pro" residing in toplevel build directory confused qmake.
# Now use sed -i to avoid going through temporaries.
--- a/configure	2009-12-07 18:13:08.000000000 +0100
+++ b/configure	2009-12-07 18:19:42.000000000 +0100
@@ -240,23 +240,22 @@
 #- Setting dirs and start qmake -----------------------------------------------
 
 echo
-sed 's%^.*cb2bibdata.path .*$%cb2bibdata.path = '$f_datadir'%g' src/src.pro > tmp.pro
-sed 's%^.*target.path .*$%target.path = '$f_bindir'%g' tmp.pro > src/src.pro
-sed 's%^.*script.path .*$%script.path = '$f_bindir'%g' src/src.pro > tmp.pro
-sed 's%^.*desktop.path .*$%desktop.path = '$f_desktopdatadir'%g' tmp.pro > src/src.pro
-sed 's%^.*icons.path .*$%icons.path = '$f_icondir'%g' src/src.pro > tmp.pro
-mv -f tmp.pro src/src.pro
+sed -i  -e 's%^.*cb2bibdata.path .*$%cb2bibdata.path = '$f_datadir'%g' \
+	-e 's%^.*target.path .*$%target.path = '$f_bindir'%g' \
+	-e 's%^.*script.path .*$%script.path = '$f_bindir'%g' \
+	-e 's%^.*desktop.path .*$%desktop.path = '$f_desktopdatadir'%g' \
+	-e 's%^.*icons.path .*$%icons.path = '$f_icondir'%g' src/src.pro 
+	
 if test "$f_disable_cbpoll" = y; then
-  echo "Setting clipboardPoll disabled"
-  sed 's% disable_cbpoll%%g' src/src.pro > tmp.pro
-  sed 's%^CONFIG.*= %CONFIG += disable_cbpoll %g' tmp.pro > src/src.pro
+	echo "Setting clipboardPoll disabled"
+	sed -i -e 's% disable_cbpoll%%g' \
+	-e 's%^CONFIG.*= %CONFIG += disable_cbpoll %g' src/src.pro
 else
-  echo "Setting clipboardPoll enabled (Unix/Linux only)"
-  sed 's% disable_cbpoll%%g' src/src.pro > tmp.pro
-  mv -f tmp.pro src/src.pro
+	echo "Setting clipboardPoll enabled (Unix/Linux only)"
+	sed -i 's% disable_cbpoll%%g' src/src.pro 
 fi
-sed 's%^const QString C2B_DATA_DIR.*$%const QString C2B_DATA_DIR("'$f_datadir'/");%g' src/c2b/cb2bib_parameters.h > tmp.par
-mv -f tmp.par src/c2b/cb2bib_parameters.h
+sed -i 's%^const QString C2B_DATA_DIR.*$%const QString C2B_DATA_DIR("'$f_datadir'/");%g' \
+	src/c2b/cb2bib_parameters.h 
 
 f_configs=
 if test "$f_disable_lzo" = y; then