]> git.ipfire.org Git - ipfire-3.x.git/blame - doxygen/patches/doxygen-1.8.4-config.patch
projects / ipfire-3.x.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
systemd: Update to 242
[ipfire-3.x.git] / doxygen / patches / doxygen-1.8.4-config.patch
CommitLineData
fb24f570
SS		 1diff -up doxygen-1.8.4/addon/doxywizard/Makefile.in.config doxygen-1.8.4/addon/doxywizard/Makefile.in
2--- doxygen-1.8.4/addon/doxywizard/Makefile.in.config 2013-01-05 16:35:52.000000000 +0100
3+++ doxygen-1.8.4/addon/doxywizard/Makefile.in 2013-05-21 12:22:49.689166894 +0200
4@@ -10,8 +10,6 @@
5 # See the GNU General Public License for more details.
6 #
7
8-QMAKE=qmake $(MKSPECS)
9-
10 all: Makefile.doxywizard
11 $(MAKE) -f Makefile.doxywizard
12
13@@ -29,11 +27,11 @@ distclean: Makefile.doxywizard
14 $(RM) Makefile.doxywizard
15
16 install:
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
26 rm doxywizard.1
27
28 FORCE:
29diff -up doxygen-1.8.4/configure.config doxygen-1.8.4/configure
30--- doxygen-1.8.4/configure.config 2013-05-19 12:05:39.000000000 +0200
31+++ doxygen-1.8.4/configure 2013-05-21 12:25:43.570743493 +0200
32@@ -296,9 +296,10 @@ if test "$f_wizard" = YES; then
33 if test -z "$QTDIR"; then
34 echo " QTDIR environment variable not set!"
35 printf " Checking for Qt..."
36- for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4} /usr; do
37+ for d in /usr/{lib64,lib,share,qt}/{qt-4,qt4,qt,qt*,4} /usr; do
38 if test -x "$d/bin/qmake"; then
39 QTDIR=$d
40+ QMAKE=$d/bin/qmake
41 fi
42 done
43 else
44@@ -606,6 +607,8 @@ INSTTOOL = $f_insttool
45 DOXYDOCS = ..
46 DOCDIR = $f_docdir
47 QTDIR = $QTDIR
48+QMAKE = $QMAKE
49+MAN1DIR = share/man/man1
50 EOF
51
52 if test "$f_dot" != NO; then
53diff -up doxygen-1.8.4/Makefile.in.config doxygen-1.8.4/Makefile.in
54--- doxygen-1.8.4/Makefile.in.config 2013-04-25 21:38:39.000000000 +0200
55+++ doxygen-1.8.4/Makefile.in 2013-05-21 12:22:49.689166894 +0200
56@@ -53,8 +53,6 @@ distclean: clean
57
58 DATE=$(shell date "+%B %Y")
59
60-MAN1DIR = man/man1
61-
62 install: doxywizard_install doxysearch_install
63 $(INSTTOOL) -d $(DESTDIR)/$(INSTALL)/bin
64 $(INSTTOOL) -m 755 bin/doxygen $(DESTDIR)/$(INSTALL)/bin
65diff -up doxygen-1.8.4/tmake/lib/linux-g++/tmake.conf.config doxygen-1.8.4/tmake/lib/linux-g++/tmake.conf
66--- doxygen-1.8.4/tmake/lib/linux-g++/tmake.conf.config 2012-12-22 19:49:04.000000000 +0100
67+++ doxygen-1.8.4/tmake/lib/linux-g++/tmake.conf 2013-05-21 12:22:49.689166894 +0200
68@@ -11,7 +11,7 @@ TMAKE_CC = gcc
69 TMAKE_CFLAGS = -pipe
70 TMAKE_CFLAGS_WARN_ON = -Wall -W
71 TMAKE_CFLAGS_WARN_OFF =
72-TMAKE_CFLAGS_RELEASE = -O2
73+TMAKE_CFLAGS_RELEASE = $(RPM_OPT_FLAGS)
74 TMAKE_CFLAGS_DEBUG = -g
75 TMAKE_CFLAGS_SHLIB = -fPIC
76 TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
77@@ -27,12 +27,12 @@ TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YAC
78
79 TMAKE_INCDIR =
80 TMAKE_LIBDIR =
81-TMAKE_INCDIR_X11 = /usr/X11R6/include
82-TMAKE_LIBDIR_X11 = /usr/X11R6/lib
83-TMAKE_INCDIR_QT = $(QTDIR)/include
84-TMAKE_LIBDIR_QT = $(QTDIR)/lib
85-TMAKE_INCDIR_OPENGL = /usr/X11R6/include
86-TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
87+TMAKE_INCDIR_X11 =
88+TMAKE_LIBDIR_X11 =
89+TMAKE_INCDIR_QT =
90+TMAKE_LIBDIR_QT =
91+TMAKE_INCDIR_OPENGL =
92+TMAKE_LIBDIR_OPENGL =
93
94 TMAKE_LINK = g++
95 TMAKE_LINK_SHLIB = g++
IPFire 3.x development tree