From 1096bf6710499ab1fbd620c1dddc27be1b92d7c0 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 5 Aug 2006 13:31:59 +0000 Subject: [PATCH] don't build wxBase separately here, this is probably an artefact of monolithic build system git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40470 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxGTK.spec | 31 ++----------------------------- 1 file changed, 2 insertions(+), 29 deletions(-) diff --git a/wxGTK.spec b/wxGTK.spec index 6d06ff66e4..8d0343bec3 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -157,18 +157,6 @@ else export MAKE="make" fi -mkdir obj-shared-no-gui -cd obj-shared-no-gui -../configure --prefix=%{_prefix} \ - --disable-gui \ -%if %{unicode} - --enable-unicode -%else - --disable-unicode -%endif -$MAKE -cd .. - mkdir obj-shared cd obj-shared ../configure --prefix=%{_prefix} \ @@ -190,19 +178,6 @@ cd contrib/src $MAKE cd ../../.. -mkdir obj-static-no-gui -cd obj-static-no-gui -../configure --prefix=%{_prefix} \ - --disable-gui \ - --disable-shared \ -%if %{unicode} - --enable-unicode -%else - --disable-unicode -%endif -$MAKE -cd .. - mkdir obj-static cd obj-static ../configure --prefix=%{_prefix} \ @@ -227,10 +202,8 @@ cd ../../.. %install rm -rf $RPM_BUILD_ROOT -(cd obj-static-no-gui; make DESTDIR=$RPM_BUILD_ROOT install) -(cd obj-static; make DESTDIR=$RPM_BUILD_ROOT install) -(cd obj-shared-no-gui; make DESTDIR=$RPM_BUILD_ROOT install) -(cd obj-shared; make DESTDIR=$RPM_BUILD_ROOT install) +(cd obj-static; make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} install) +(cd obj-shared; make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} install) # --- wxBase headers list begins here --- cat <wxbase-headers.files -- 2.45.2