Skip to content

Commit

Permalink
Fix pyqwt5 compilation
Browse files Browse the repository at this point in the history
Compilation currently fails due to unresolved 'reprefix' variable. The
following incorrect sed command is executed during install with prefix
'/usr/local':

sed 's/\/usr\/share\/sip\//\/share\/sip\//' qwt5qt4/Makefile > qwt5qt4/Makefile.tmp

This command results in an incorrect Makefile and failed compilation.

This fix replaces 'reprefix' with 'prefix' so the following sed command
is executed:

sed 's/\/usr\/share\/sip\///usr/local\/share\/sip\//' qwt5qt4/Makefile > qwt5qt4/Makefile.tmp
  • Loading branch information
jmullins committed Feb 24, 2016
1 parent 90b1487 commit 4bf4e23
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pyqwt5.lwr
Expand Up @@ -33,14 +33,14 @@ configure: 'sed ''s/-lqwt/-lqwt-qt4/'' ../qwt-5.2/qwt.prf > ../qwt-5.2/qwt.prf.t

cp qwt5qt4/Makefile.tmp qwt5qt4/Makefile

sed ''s/\/usr\/share\/sip\//$reprefix\/share\/sip\//'' qwt5qt4/Makefile > qwt5qt4/Makefile.tmp
sed ''s/\/usr\/share\/sip\//$prefix\/share\/sip\//'' qwt5qt4/Makefile > qwt5qt4/Makefile.tmp
&& \

cp qwt5qt4/Makefile.tmp qwt5qt4/Makefile

mkdir -p $prefix/share/sip/PyQt4/Qwt5

sed ''s/\/usr\/lib64\/python2.6\/site-packages\/PyQt4\//$reprefix\/lib\/python2.6\/site-packages\/PyQt4\//''
sed ''s/\/usr\/lib64\/python2.6\/site-packages\/PyQt4\//$prefix\/lib\/python2.6\/site-packages\/PyQt4\//''
qwt5qt4/Makefile > qwt5qt4/Makefile.tmp && \

cp qwt5qt4/Makefile.tmp qwt5qt4/Makefile
Expand Down

0 comments on commit 4bf4e23

Please sign in to comment.