rpms/ghc/devel ghc.spec,1.44,1.45

Jens Petersen petersen at fedoraproject.org
Wed Sep 24 08:03:52 UTC 2008


Author: petersen

Update of /cvs/extras/rpms/ghc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12614

Modified Files:
	ghc.spec 
Log Message:
revert back from using %configure since it fails on ppc


Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ghc.spec	24 Sep 2008 07:36:11 -0000	1.44
+++ ghc.spec	24 Sep 2008 08:03:22 -0000	1.45
@@ -80,9 +80,12 @@
 %endif
 
 export HaddockCmd=%{_bindir}/haddock-0.9
-# workaround ghc configure script hysteria about archs
-%define _target_platform %{_build}
-%configure
+
+./configure --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} \
+  --bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \
+  --datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} \
+  --libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} \
+  --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir}
 
 make %{_smp_mflags}
 make %{_smp_mflags} -C libraries
@@ -183,7 +186,6 @@
 - fix the source urls back
 - drop requires chkconfig
 - do not override __spec_install_post
-- override _target_platform so we can use %%configure
 - setup docs building in build.mk
 - no longer need to remove network/include/Typeable.h
 - install binaries under libdir not libexec




More information about the fedora-extras-commits mailing list