1 diff -up doxygen-1.6.0/addon/doxywizard/Makefile.in.config doxygen-1.6.0/addon/doxywizard/Makefile.in
2 --- doxygen-1.6.0/addon/doxywizard/Makefile.in.config 2009-07-13 22:09:03.000000000 +0200
3 +++ doxygen-1.6.0/addon/doxywizard/Makefile.in 2009-08-21 16:42:13.000000000 +0200
5 # See the GNU General Public License for more details.
10 all: Makefile.doxywizard
11 $(MAKE) -f Makefile.doxywizard
13 @@ -29,11 +27,11 @@ distclean: Makefile.doxywizard
14 $(RM) Makefile.doxywizard
17 - $(INSTTOOL) -d $(INSTALL)/bin
18 - $(INSTTOOL) -m 755 ../../bin/doxywizard $(INSTALL)/bin
19 - $(INSTTOOL) -d $(INSTALL)/$(MAN1DIR)
20 + $(INSTTOOL) -d $(DESTDIR)$(INSTALL)/bin
21 + $(INSTTOOL) -m 755 ../../bin/doxywizard $(DESTDIR)$(INSTALL)/bin
22 + $(INSTTOOL) -d $(DESTDIR)$(INSTALL)/$(MAN1DIR)
23 cat ../../doc/doxywizard.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxywizard.1
24 - $(INSTTOOL) -m 644 doxywizard.1 $(INSTALL)/$(MAN1DIR)/doxywizard.1
25 + $(INSTTOOL) -m 644 doxywizard.1 $(DESTDIR)$(INSTALL)/$(MAN1DIR)/doxywizard.1
29 diff -up doxygen-1.6.0/configure.config doxygen-1.6.0/configure
30 --- doxygen-1.6.0/configure.config 2009-08-20 14:15:07.000000000 +0200
31 +++ doxygen-1.6.0/configure 2009-08-21 16:41:36.000000000 +0200
32 @@ -268,9 +268,10 @@ if test "$f_wizard" = YES; then
33 if test -z "$QTDIR"; then
34 echo " QTDIR environment variable not set!"
35 echo -n " Checking for Qt..."
36 - for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4}; do
37 + for d in /usr/{lib64,lib,share,qt}/{qt-4,qt4,qt,qt*,4}; do
38 if test -x "$d/bin/qmake"; then
44 @@ -485,6 +486,8 @@ INSTTOOL = $f_insttool
49 +MAN1DIR = share/man/man1
52 if test "$f_dot" != NO; then
53 diff -up doxygen-1.6.0/Makefile.in.config doxygen-1.6.0/Makefile.in
54 --- doxygen-1.6.0/Makefile.in.config 2009-08-14 15:58:42.000000000 +0200
55 +++ doxygen-1.6.0/Makefile.in 2009-08-21 16:34:02.000000000 +0200
56 @@ -44,8 +44,6 @@ distclean: clean
58 DATE=$(shell date "+%B %Y")
62 install: doxywizard_install
63 $(INSTTOOL) -d $(DESTDIR)/$(INSTALL)/bin
64 $(INSTTOOL) -m 755 bin/doxygen $(DESTDIR)/$(INSTALL)/bin