|
 |
7f0f82 |
diff -up doxygen-1.8.4/addon/doxywizard/Makefile.in.config doxygen-1.8.4/addon/doxywizard/Makefile.in
|
|
|
7f0f82 |
--- doxygen-1.8.4/addon/doxywizard/Makefile.in.config 2013-01-05 16:35:52.000000000 +0100
|
|
|
7f0f82 |
+++ doxygen-1.8.4/addon/doxywizard/Makefile.in 2013-05-21 12:22:49.689166894 +0200
|
|
|
7f0f82 |
@@ -10,8 +10,6 @@
|
|
|
7f0f82 |
# See the GNU General Public License for more details.
|
|
|
7f0f82 |
#
|
|
|
7f0f82 |
|
|
|
7f0f82 |
-QMAKE=qmake $(MKSPECS)
|
|
|
7f0f82 |
-
|
|
|
7f0f82 |
all: Makefile.doxywizard
|
|
|
7f0f82 |
$(MAKE) -f Makefile.doxywizard
|
|
|
7f0f82 |
|
|
|
7f0f82 |
diff -up doxygen-1.8.4/configure.config doxygen-1.8.4/configure
|
|
|
7f0f82 |
--- doxygen-1.8.4/configure.config 2013-05-19 12:05:39.000000000 +0200
|
|
|
7f0f82 |
+++ doxygen-1.8.4/configure 2013-05-21 12:25:43.570743493 +0200
|
|
|
7f0f82 |
@@ -296,9 +296,10 @@ if test "$f_wizard" = YES; then
|
|
|
7f0f82 |
if test -z "$QTDIR"; then
|
|
|
7f0f82 |
echo " QTDIR environment variable not set!"
|
|
|
7f0f82 |
printf " Checking for Qt..."
|
|
|
7f0f82 |
- for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4} /usr; do
|
|
|
7f0f82 |
+ for d in /usr/{lib64,lib,share,qt}/{qt-4,qt4,qt,qt*,4} /usr; do
|
|
|
7f0f82 |
if test -x "$d/bin/qmake"; then
|
|
|
7f0f82 |
QTDIR=$d
|
|
|
7f0f82 |
+ QMAKE=$d/bin/qmake
|
|
|
7f0f82 |
fi
|
|
|
7f0f82 |
done
|
|
|
7f0f82 |
else
|
|
|
7f0f82 |
@@ -606,6 +607,8 @@ INSTTOOL = $f_insttool
|
|
|
7f0f82 |
DOXYDOCS = ..
|
|
|
7f0f82 |
DOCDIR = $f_docdir
|
|
|
7f0f82 |
QTDIR = $QTDIR
|
|
|
7f0f82 |
+QMAKE = $QMAKE
|
|
|
7f0f82 |
+MAN1DIR = share/man/man1
|
|
|
7f0f82 |
EOF
|
|
|
7f0f82 |
|
|
|
7f0f82 |
if test "$f_dot" != NO; then
|
|
|
7f0f82 |
diff -up doxygen-1.8.4/Makefile.in.config doxygen-1.8.4/Makefile.in
|
|
|
7f0f82 |
--- doxygen-1.8.4/Makefile.in.config 2013-04-25 21:38:39.000000000 +0200
|
|
|
7f0f82 |
+++ doxygen-1.8.4/Makefile.in 2013-05-21 12:22:49.689166894 +0200
|
|
|
7f0f82 |
@@ -53,8 +53,6 @@ distclean: clean
|
|
|
7f0f82 |
|
|
|
7f0f82 |
DATE=$(shell date "+%B %Y")
|
|
|
7f0f82 |
|
|
|
7f0f82 |
-MAN1DIR = man/man1
|
|
|
7f0f82 |
-
|
|
|
7f0f82 |
install: doxywizard_install doxysearch_install
|
|
|
7f0f82 |
$(INSTTOOL) -d $(DESTDIR)/$(INSTALL)/bin
|
|
|
7f0f82 |
$(INSTTOOL) -m 755 bin/doxygen $(DESTDIR)/$(INSTALL)/bin
|
|
|
7f0f82 |
diff -up doxygen-1.8.4/tmake/lib/linux-g++/tmake.conf.config doxygen-1.8.4/tmake/lib/linux-g++/tmake.conf
|
|
|
7f0f82 |
--- doxygen-1.8.4/tmake/lib/linux-g++/tmake.conf.config 2012-12-22 19:49:04.000000000 +0100
|
|
|
7f0f82 |
+++ doxygen-1.8.4/tmake/lib/linux-g++/tmake.conf 2013-05-21 12:22:49.689166894 +0200
|
|
|
7f0f82 |
@@ -11,7 +11,7 @@ TMAKE_CC = gcc
|
|
|
7f0f82 |
TMAKE_CFLAGS = -pipe
|
|
|
7f0f82 |
TMAKE_CFLAGS_WARN_ON = -Wall -W
|
|
|
7f0f82 |
TMAKE_CFLAGS_WARN_OFF =
|
|
|
7f0f82 |
-TMAKE_CFLAGS_RELEASE = -O2
|
|
|
7f0f82 |
+TMAKE_CFLAGS_RELEASE = $(RPM_OPT_FLAGS)
|
|
|
7f0f82 |
TMAKE_CFLAGS_DEBUG = -g
|
|
|
7f0f82 |
TMAKE_CFLAGS_SHLIB = -fPIC
|
|
|
7f0f82 |
TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
|
|
|
7f0f82 |
@@ -27,12 +27,12 @@ TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YAC
|
|
|
7f0f82 |
|
|
|
7f0f82 |
TMAKE_INCDIR =
|
|
|
7f0f82 |
TMAKE_LIBDIR =
|
|
|
7f0f82 |
-TMAKE_INCDIR_X11 = /usr/X11R6/include
|
|
|
7f0f82 |
-TMAKE_LIBDIR_X11 = /usr/X11R6/lib
|
|
|
7f0f82 |
-TMAKE_INCDIR_QT = $(QTDIR)/include
|
|
|
7f0f82 |
-TMAKE_LIBDIR_QT = $(QTDIR)/lib
|
|
|
7f0f82 |
-TMAKE_INCDIR_OPENGL = /usr/X11R6/include
|
|
|
7f0f82 |
-TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
|
|
|
7f0f82 |
+TMAKE_INCDIR_X11 =
|
|
|
7f0f82 |
+TMAKE_LIBDIR_X11 =
|
|
|
7f0f82 |
+TMAKE_INCDIR_QT =
|
|
|
7f0f82 |
+TMAKE_LIBDIR_QT =
|
|
|
7f0f82 |
+TMAKE_INCDIR_OPENGL =
|
|
|
7f0f82 |
+TMAKE_LIBDIR_OPENGL =
|
|
|
7f0f82 |
|
|
|
7f0f82 |
TMAKE_LINK = g++
|
|
|
7f0f82 |
TMAKE_LINK_SHLIB = g++
|