The unified diff between revisions [cc7ee27b..] and [0c11a132..] is displayed below. It can also be downloaded as a raw diff.

This diff has been restricted to the following files: 'src/Makefile.bootstrap'

#
#
# patch "src/Makefile.bootstrap"
#  from [e284a14cb35c67c7deca37623ae2955f15f273be]
#    to [7fdc068108955ac1a448e5645450f2e236bc0ed7]
#
============================================================
--- src/Makefile.bootstrap	e284a14cb35c67c7deca37623ae2955f15f273be
+++ src/Makefile.bootstrap	7fdc068108955ac1a448e5645450f2e236bc0ed7
@@ -5,7 +5,7 @@
 #

 # Set QTDIR to a reasonable default if unset.
-QTDIR ?= /usr/local/Trolltech/Qt-4.1.3/
+QTDIR ?= /usr/local/Trolltech/Qt-4.1.3-static/

 # Rule to generate the qmake Makefile for building xxdiff.
 QMAKE = $(QTDIR)/bin/qmake
@@ -25,6 +25,6 @@ Makefile.qmake Makefile makefile:
 # calls back into this bootstrap makefile.  You should be able to just change
 # xxdiff.pro and type "make" and for everything to work automatically.
 Makefile.qmake Makefile makefile:
-	$(QMAKE) -o Makefile.qmake xxdiff.pro
+	$(QMAKE) -o Makefile.qmake xxdiff.pro "CONFIG+=mystaticconfig"
 	cat Makefile.qmake Makefile.extra > Makefile