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