projects / packages / doxygen.git / blame
| Commit | Line | Data |
|---|---|---|
| 2b85850c JB |
1 | --- doxygen-1.3.8/tmake/lib/linux-g++/tmake.conf~ 2002-08-01 09:29:09.000000000 +0200 |
| 2 | +++ doxygen-1.3.8/tmake/lib/linux-g++/tmake.conf 2003-06-17 16:57:29.000000000 +0200 | |
| da710461 | 3 | @@ -29,7 +29,7 @@ |
| 55381bcc JB |
4 | TMAKE_LIBDIR = |
| 5 | TMAKE_INCDIR_X11 = /usr/X11R6/include | |
| 6 | TMAKE_LIBDIR_X11 = /usr/X11R6/lib | |
| 7 | -TMAKE_INCDIR_QT = $(QTDIR)/include | |
| da710461 | 8 | +TMAKE_INCDIR_QT = $(QTDIR)/include/qt |
| 9 | TMAKE_LIBDIR_QT = $(QTDIR)/lib | |
| 55381bcc JB |
10 | TMAKE_INCDIR_OPENGL = /usr/X11R6/include |
| 11 | TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib | |
| 12c9119d PS |
12 | --- doxygen-1.5.1/tmake/lib/linux-64/tmake.conf.orig 2006-07-21 19:54:13.000000000 +0000 |
| 13 | +++ doxygen-1.5.1/tmake/lib/linux-64/tmake.conf 2006-12-11 20:15:12.000000000 +0000 | |
| 14 | @@ -29,7 +29,7 @@ | |
| 15 | TMAKE_LIBDIR = | |
| 16 | TMAKE_INCDIR_X11 = /usr/X11R6/include | |
| 17 | TMAKE_LIBDIR_X11 = /usr/X11R6/lib64 | |
| 18 | -TMAKE_INCDIR_QT = $(QTDIR)/include | |
| 19 | +TMAKE_INCDIR_QT = $(QTDIR)/include/qt | |
| 20 | TMAKE_LIBDIR_QT = $(QTDIR)/lib64 | |
| 21 | TMAKE_INCDIR_OPENGL = /usr/X11R6/include | |
| 22 | TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib64 | |
| 05073ad1 PS |
23 | --- doxygen-1.5.1/configure.orig 2006-12-11 21:47:53.000000000 +0100 |
| 24 | +++ doxygen-1.5.1/configure 2006-12-11 21:53:56.546591750 +0100 | |
| 25 | @@ -259,7 +259,7 @@ | |
| 26 | echo " QTDIR environment variable not set!" | |
| 27 | echo -n " Checking for Qt..." | |
| 28 | for d in /usr/{lib,share,qt}/{qt-3,qt3,qt,qt*,3}; do | |
| 29 | - if test -d "$d/lib" -a -d "$d/include" -a -x "$d/bin/moc"; then | |
| 30 | + if test -d "$d/lib" -a -d "$d/include/qt" -a -x "$d/bin/moc"; then | |
| 31 | QTDIR=$d | |
| 32 | fi | |
| 33 | done | |
| 34 | @@ -281,15 +281,15 @@ | |
| 35 | fi | |
| 36 | LIBDIR=lib64 | |
| 37 | fi | |
| 38 | - if test ! -d "$QTDIR/include"; then | |
| 39 | - echo "QTDIR is set to $QTDIR, but include directory $QTDIR/include does not exist!" | |
| 40 | + if test ! -d "$QTDIR/include/qt"; then | |
| 41 | + echo "QTDIR is set to $QTDIR, but include directory $QTDIR/include/qt does not exist!" | |
| 42 | exit 2 | |
| 43 | fi | |
| 44 | if test ! -x "$QTDIR/bin/moc"; then | |
| 45 | echo "QTDIR is set to $QTDIR, but the moc tool could not be found in $QTDIR/bin!" | |
| 46 | exit 2 | |
| 47 | fi | |
| 48 | - echo " headers $QTDIR/include," | |
| 49 | + echo " headers $QTDIR/include/qt," | |
| 50 | echo " libraries $QTDIR/$LIBDIR" | |
| 51 | if test -f $QTDIR/$LIBDIR/libqt-mt.la; then | |
| 52 | f_thread=YES |