]>
Commit | Line | Data |
---|---|---|
6753fe6c SP |
1 | diff -ur doxygen-1.4.2/addon/doxywizard/Makefile.doxywizard doxygen-1.4.2.new/addon/doxywizard/Makefile.doxywizard |
2 | --- doxygen-1.4.2/addon/doxywizard/Makefile.doxywizard 2005-03-28 10:38:39.000000000 +0200 | |
3 | +++ doxygen-1.4.2.new/addon/doxywizard/Makefile.doxywizard 2005-03-28 19:28:46.000362416 +0200 | |
9070e95e | 4 | @@ -24,7 +24,7 @@ |
6753fe6c | 5 | INCPATH = -I../../src -I$(QTDIR)/include |
9070e95e | 6 | LINK = g++ |
25c607cc | 7 | LFLAGS = -g |
2b85850c JB |
8 | -LIBS = -L$(QTDIR)/lib -lqt-mt -L/usr/X11R6/lib -lXext -lX11 -lm |
9 | +LIBS = -L$(QTDIR)/lib64 -lqt-mt -L/usr/X11R6/lib64 -lXext -lX11 -lm | |
6753fe6c | 10 | MOC = /usr/qt/3/bin/moc |
9070e95e JK |
11 | |
12 | TAR = tar -cf | |
6753fe6c SP |
13 | diff -ur doxygen-1.4.2/configure doxygen-1.4.2.new/configure |
14 | --- doxygen-1.4.2/configure 2005-01-03 20:23:19.000000000 +0100 | |
15 | +++ doxygen-1.4.2.new/configure 2005-03-28 19:29:30.973525456 +0200 | |
16 | @@ -247,8 +247,8 @@ | |
2b85850c | 17 | echo "check the Qt installation instructions!" |
9070e95e JK |
18 | exit 2 |
19 | else | |
20 | - if test ! -d "$QTDIR/lib"; then | |
2b85850c | 21 | - echo "QTDIR is set to $QTDIR, but library directory $QTDIR/lib does not exist!" |
9070e95e | 22 | + if test ! -d "$QTDIR/lib64"; then |
2b85850c | 23 | + echo "QTDIR is set to $QTDIR, but library directory $QTDIR/lib64 does not exist!" |
9070e95e JK |
24 | exit 2 |
25 | fi | |
2b85850c | 26 | if test ! -d "$QTDIR/include"; then |
6753fe6c | 27 | @@ -260,8 +260,8 @@ |
9070e95e JK |
28 | exit 2 |
29 | fi | |
30 | echo " headers $QTDIR/include," | |
31 | - echo " libraries $QTDIR/lib" | |
2b85850c | 32 | - if test -n "`ls $QTDIR/lib/* | grep qt-mt`"; then |
9070e95e | 33 | + echo " libraries $QTDIR/lib64" |
2b85850c JB |
34 | + if test -n "`ls $QTDIR/lib64/* | grep qt-mt`"; then |
35 | f_thread=YES | |
36 | fi | |
9070e95e | 37 | fi |
6753fe6c SP |
38 | diff -ur doxygen-1.4.2/tmake/doc/m-linux-gcc.html doxygen-1.4.2.new/tmake/doc/m-linux-gcc.html |
39 | --- doxygen-1.4.2/tmake/doc/m-linux-gcc.html 2003-12-14 23:00:58.000000000 +0100 | |
40 | +++ doxygen-1.4.2.new/tmake/doc/m-linux-gcc.html 2005-03-28 19:29:53.126157744 +0200 | |
9070e95e JK |
41 | @@ -19,7 +19,7 @@ |
42 | INCPATH = -I$(QTDIR)/include | |
43 | LINK = g++ | |
44 | LFLAGS = | |
45 | -LIBS = -L$(QTDIR)/lib -lqt -L/usr/X11R6/lib -lX11 | |
46 | +LIBS = -L$(QTDIR)/lib64 -lqt -L/usr/X11R6/lib64 -lX11 | |
47 | MOC = moc | |
48 | ||
49 | ####### Files | |
6753fe6c SP |
50 | diff -ur doxygen-1.4.2/tmake/lib/linux-g++/tmake.conf doxygen-1.4.2.new/tmake/lib/linux-g++/tmake.conf |
51 | --- doxygen-1.4.2/tmake/lib/linux-g++/tmake.conf 2004-06-20 18:50:17.000000000 +0200 | |
52 | +++ doxygen-1.4.2.new/tmake/lib/linux-g++/tmake.conf 2005-03-28 19:30:52.187179104 +0200 | |
9070e95e JK |
53 | @@ -28,11 +28,11 @@ |
54 | TMAKE_INCDIR = | |
55 | TMAKE_LIBDIR = | |
56 | TMAKE_INCDIR_X11 = /usr/X11R6/include | |
57 | -TMAKE_LIBDIR_X11 = /usr/X11R6/lib | |
58 | +TMAKE_LIBDIR_X11 = /usr/X11R6/lib64 | |
6753fe6c | 59 | TMAKE_INCDIR_QT = $(QTDIR)/include |
9070e95e JK |
60 | -TMAKE_LIBDIR_QT = $(QTDIR)/lib |
61 | +TMAKE_LIBDIR_QT = $(QTDIR)/lib64 | |
62 | TMAKE_INCDIR_OPENGL = /usr/X11R6/include | |
63 | -TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib | |
64 | +TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib64 | |
65 | ||
66 | TMAKE_LINK = g++ | |
67 | TMAKE_LINK_SHLIB = g++ |