Blame SOURCES/doxygen-1.7.1-config.patch

f61693
diff -up doxygen-1.7.1/addon/doxywizard/Makefile.in.config doxygen-1.7.1/addon/doxywizard/Makefile.in
f61693
--- doxygen-1.7.1/addon/doxywizard/Makefile.in.config	2010-05-23 16:51:31.000000000 +0200
f61693
+++ doxygen-1.7.1/addon/doxywizard/Makefile.in	2010-07-19 13:38:33.000000000 +0200
f61693
@@ -10,8 +10,6 @@
f61693
 # See the GNU General Public License for more details.
f61693
 # 
f61693
 
f61693
-QMAKE=qmake $(MKSPECS)
f61693
-
f61693
 all: Makefile.doxywizard  
f61693
 	$(MAKE) -f Makefile.doxywizard 
f61693
 
f61693
@@ -29,11 +27,11 @@ distclean: Makefile.doxywizard
f61693
 	$(RM) Makefile.doxywizard
f61693
 
f61693
 install:
f61693
-	$(INSTTOOL) -d $(INSTALL)/bin	
f61693
-	$(INSTTOOL) -m 755 ../../bin/doxywizard $(INSTALL)/bin	
f61693
-	$(INSTTOOL) -d $(INSTALL)/$(MAN1DIR)
f61693
+	$(INSTTOOL) -d $(DESTDIR)$(INSTALL)/bin	
f61693
+	$(INSTTOOL) -m 755 ../../bin/doxywizard $(DESTDIR)$(INSTALL)/bin	
f61693
+	$(INSTTOOL) -d $(DESTDIR)$(INSTALL)/$(MAN1DIR)
f61693
 	cat ../../doc/doxywizard.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxywizard.1
f61693
-	$(INSTTOOL) -m 644 doxywizard.1 $(INSTALL)/$(MAN1DIR)/doxywizard.1
f61693
+	$(INSTTOOL) -m 644 doxywizard.1 $(DESTDIR)$(INSTALL)/$(MAN1DIR)/doxywizard.1
f61693
 	rm doxywizard.1
f61693
 
f61693
 FORCE:
f61693
diff -up doxygen-1.7.1/configure.config doxygen-1.7.1/configure
f61693
--- doxygen-1.7.1/configure.config	2010-06-25 11:46:38.000000000 +0200
f61693
+++ doxygen-1.7.1/configure	2010-07-19 12:03:53.000000000 +0200
f61693
@@ -268,9 +268,10 @@ if test "$f_wizard" = YES; then
f61693
   if test -z "$QTDIR"; then
f61693
     echo "  QTDIR environment variable not set!"
f61693
     echo -n "  Checking for Qt..."
f61693
-    for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4} /usr; do
f61693
+    for d in /usr/{lib64,lib,share,qt}/{qt-4,qt4,qt,qt*,4} /usr; do
f61693
       if test -x "$d/bin/qmake"; then
f61693
         QTDIR=$d
f61693
+        QMAKE=$d/bin/qmake
f61693
       fi
f61693
     done
f61693
   else
f61693
@@ -485,6 +486,8 @@ INSTTOOL  = $f_insttool
f61693
 DOXYDOCS  = ..
f61693
 DOCDIR    = $f_docdir
f61693
 QTDIR     = $QTDIR
f61693
+QMAKE     = $QMAKE
f61693
+MAN1DIR    = share/man/man1
f61693
 EOF
f61693
 
f61693
 if test "$f_dot" != NO; then
f61693
diff -up doxygen-1.7.1/Makefile.in.config doxygen-1.7.1/Makefile.in
f61693
--- doxygen-1.7.1/Makefile.in.config	2009-08-20 21:41:13.000000000 +0200
f61693
+++ doxygen-1.7.1/Makefile.in	2010-07-19 12:03:53.000000000 +0200
f61693
@@ -44,8 +44,6 @@ distclean: clean
f61693
 
f61693
 DATE=$(shell date "+%B %Y")
f61693
 
f61693
-MAN1DIR = man/man1
f61693
-
f61693
 install: doxywizard_install 
f61693
 	$(INSTTOOL) -d $(DESTDIR)/$(INSTALL)/bin
f61693
 	$(INSTTOOL) -m 755 bin/doxygen    $(DESTDIR)/$(INSTALL)/bin
f61693
diff -up doxygen-1.7.1/tmake/lib/linux-g++/tmake.conf.config doxygen-1.7.1/tmake/lib/linux-g++/tmake.conf
f61693
--- doxygen-1.7.1/tmake/lib/linux-g++/tmake.conf.config	2008-12-06 14:16:20.000000000 +0100
f61693
+++ doxygen-1.7.1/tmake/lib/linux-g++/tmake.conf	2010-07-19 12:03:53.000000000 +0200
f61693
@@ -11,7 +11,7 @@ TMAKE_CC		= gcc
f61693
 TMAKE_CFLAGS		= -pipe
f61693
 TMAKE_CFLAGS_WARN_ON	= -Wall -W -fno-exceptions
f61693
 TMAKE_CFLAGS_WARN_OFF	=
f61693
-TMAKE_CFLAGS_RELEASE	= -O2
f61693
+TMAKE_CFLAGS_RELEASE	= $(RPM_OPT_FLAGS)
f61693
 TMAKE_CFLAGS_DEBUG	= -g
f61693
 TMAKE_CFLAGS_SHLIB	= -fPIC
f61693
 TMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
f61693
@@ -27,12 +27,12 @@ TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YAC
f61693
 
f61693
 TMAKE_INCDIR		=
f61693
 TMAKE_LIBDIR		=
f61693
-TMAKE_INCDIR_X11	= /usr/X11R6/include
f61693
-TMAKE_LIBDIR_X11	= /usr/X11R6/lib
f61693
-TMAKE_INCDIR_QT		= $(QTDIR)/include
f61693
-TMAKE_LIBDIR_QT		= $(QTDIR)/lib
f61693
-TMAKE_INCDIR_OPENGL	= /usr/X11R6/include
f61693
-TMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
f61693
+TMAKE_INCDIR_X11	=
f61693
+TMAKE_LIBDIR_X11	=
f61693
+TMAKE_INCDIR_QT		=
f61693
+TMAKE_LIBDIR_QT		=
f61693
+TMAKE_INCDIR_OPENGL	=
f61693
+TMAKE_LIBDIR_OPENGL	=
f61693
 
f61693
 TMAKE_LINK		= g++
f61693
 TMAKE_LINK_SHLIB	= g++