summaryrefslogtreecommitdiff
path: root/cad/klayout/files/patch-build.sh
diff options
context:
space:
mode:
Diffstat (limited to 'cad/klayout/files/patch-build.sh')
-rw-r--r--cad/klayout/files/patch-build.sh29
1 files changed, 14 insertions, 15 deletions
diff --git a/cad/klayout/files/patch-build.sh b/cad/klayout/files/patch-build.sh
index e0d4374c06ef..cd6495b21678 100644
--- a/cad/klayout/files/patch-build.sh
+++ b/cad/klayout/files/patch-build.sh
@@ -1,33 +1,32 @@
---- build.sh.orig Tue May 8 04:41:18 2007
-+++ build.sh Sat Jun 2 16:43:04 2007
-@@ -77,12 +77,12 @@
+--- build.sh.orig Fri Nov 9 04:31:36 2007
++++ build.sh Sun Jan 6 18:57:53 2008
+@@ -126,11 +126,11 @@
exit 1
fi
--if [ ! -r $QTDIR/bin/moc ]; then
-+if [ ! -r $QTDIR/bin/moc-qt4 ]; then
- echo "*** ERROR: unable to locate Qt MOC in $QTDIR/bin"
+-if [ ! -r $QTBIN/moc ]; then
++if [ ! -r $QTBIN/moc-qt4 ]; then
+ echo "*** ERROR: unable to locate Qt MOC in $QTBIN"
exit 1
fi
-
--if [ ! -r $QTDIR/bin/uic ]; then
-+if [ ! -r $QTDIR/bin/uic-qt4 ]; then
- echo "*** ERROR: unable to locate Qt UIC in $QTDIR/bin"
+-if [ ! -r $QTBIN/uic ]; then
++if [ ! -r $QTBIN/uic-qt4 ]; then
+ echo "*** ERROR: unable to locate Qt UIC in $QTBIN"
exit 1
fi
-@@ -153,12 +153,12 @@
+@@ -231,12 +231,12 @@
echo "Build done."
echo ""
echo "Final binary is ready in $BIN/$EXEC_NAME."
- echo "To run it, you may need to add the following to your LD_LIBRARY_PATH:"
-- echo "$QTDIR/lib"
+- echo "$QTLIB"
+ #echo "To run it, you may need to add the following to your LD_LIBRARY_PATH:"
-+ #echo "$QTDIR/lib"
++ #echo "$QTLIB"
-- LD_LIBRARY_PATH=$QTDIR/lib:$LD_LIBRARY_PATH
+- LD_LIBRARY_PATH=$QTLIB:$LD_LIBRARY_PATH
- $BIN/$EXEC_NAME -v
- $BIN/$EXEC_NAME -h
-+ #LD_LIBRARY_PATH=$QTDIR/lib:$LD_LIBRARY_PATH
++ #LD_LIBRARY_PATH=$QTLIB:$LD_LIBRARY_PATH
+ #$BIN/$EXEC_NAME -v
+ #$BIN/$EXEC_NAME -h