# HG changeset patch # User Michael Schloh von Bennewitz # Date 1254579211 -7200 # Node ID 11637477f8ce0e172623ec5e8669f661830ae7b6 # Parent ccd470e665aab960cdaa454d28e6bdfdbf3e0320 Correct buildconf, optionally build using Qt (and doxygen implicitly.) diff -r ccd470e665aa -r 11637477f8ce doxygen/doxygen.spec --- a/doxygen/doxygen.spec Sat Oct 03 16:12:58 2009 +0200 +++ b/doxygen/doxygen.spec Sat Oct 03 16:13:31 2009 +0200 @@ -32,11 +32,13 @@ Group: Development License: GPL Version: 1.6.1 -Release: 20090825 +Release: 20091001 + +# build options +%option with_qt no # list of sources Source0: ftp://ftp.stack.nl/pub/users/dimitri/doxygen-%{version}.src.tar.gz -Patch0: doxygen.patch # build information Prefix: %{l_prefix} @@ -45,6 +47,10 @@ PreReq: OpenPKG, openpkg >= 20040130 BuildPreReq: libiconv PreReq: libiconv +%if "%{with_qt}" == "yes" +BuildPreReq: qt >= 4 +PreReq: qt >= 4 +%endif AutoReq: no AutoReqProv: no @@ -60,7 +66,13 @@ %prep %setup -q - %patch -p0 + %{l_shtool} subst \ + -e 's;\(\$(INSTALL)\);$(DESTDIR)/\1;g' \ + addon/doxywizard/Makefile.in + %{l_shtool} subst \ + -e 's;\($(DESTDIR)\)/;\1;g' \ + addon/doxywizard/Makefile.in \ + Makefile.in %build opt="" @@ -73,6 +85,9 @@ CXX="%{l_cxx}" \ CFLAGS="%{l_cflags -O}" \ CXXFLAGS="%{l_cxxflags -O}" \ +%if "%{with_qt}" == "yes" + QTDIR="%{l_prefix}" \ +%endif %{l_bash} ./configure \ --prefix %{l_prefix} \ --perl %{l_prefix}/bin/perl \ @@ -80,6 +95,9 @@ --install %{l_prefix}/bin/install \ --release \ --english-only \ +%if "%{with_qt}" == "yes" + --with-doxywizard \ +%endif $opt ( cd src %{l_make} %{l_mflags} Makefile.libdoxycfg Makefile.doxygen @@ -95,8 +113,10 @@ %install rm -rf $RPM_BUILD_ROOT %{l_make} %{l_mflags} install \ - INSTALL=$RPM_BUILD_ROOT%{l_prefix} \ - INSTTOOL="%{l_shtool} install" || true + DESTDIR=$RPM_BUILD_ROOT \ + INSTALL=%{l_prefix} \ + MAN1DIR=man/man1 \ + INSTTOOL="%{l_shtool} install -c" || true strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}