add ghcpkgdocdir
allows for unversioned haddock dirs similarly to _pkgdocdir
This commit is contained in:
parent
795c0c522b
commit
4d2eb25803
@ -30,6 +30,8 @@ fi
|
|||||||
%ghcdocbasedir %{_docdir}/ghc/html
|
%ghcdocbasedir %{_docdir}/ghc/html
|
||||||
# libraries doc dir
|
# libraries doc dir
|
||||||
%ghclibdocdir %{ghcdocbasedir}/libraries
|
%ghclibdocdir %{ghcdocbasedir}/libraries
|
||||||
|
# pkg doc dir
|
||||||
|
%ghcpkgdocdir %{ghcdocbasedir}/libraries/%{pkg_name}
|
||||||
# top library dir
|
# top library dir
|
||||||
%ghclibdir %{_libdir}/ghc-%{ghc_version}
|
%ghclibdir %{_libdir}/ghc-%{ghc_version}
|
||||||
|
|
||||||
@ -73,8 +75,7 @@ done\
|
|||||||
%define pkgver %{?2}%{!?2:%{version}}\
|
%define pkgver %{?2}%{!?2:%{version}}\
|
||||||
%define pkgnamever %{pkgname}-%{pkgver}\
|
%define pkgnamever %{pkgname}-%{pkgver}\
|
||||||
%cabal register --gen-pkg-config\
|
%cabal register --gen-pkg-config\
|
||||||
mkdir -p %{buildroot}%{ghclibdir}/package.conf.d\
|
install -D --mode=0644 %{pkgnamever}.conf %{buildroot}%{ghclibdir}/package.conf.d/%{pkgnamever}.conf\
|
||||||
install --mode=0644 %{pkgnamever}.conf %{buildroot}%{ghclibdir}/package.conf.d\
|
|
||||||
%{nil}
|
%{nil}
|
||||||
|
|
||||||
# ghc_bin_build
|
# ghc_bin_build
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
#%%global without_hscolour 1
|
#%%global without_hscolour 1
|
||||||
|
|
||||||
Name: ghc-rpm-macros
|
Name: ghc-rpm-macros
|
||||||
Version: 1.1.3
|
Version: 1.2
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: RPM macros for building packages for GHC
|
Summary: RPM macros for building packages for GHC
|
||||||
|
|
||||||
@ -57,8 +57,8 @@ echo no build stage needed
|
|||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
install -p -D -m 0644 %{SOURCE0} ${RPM_BUILD_ROOT}/%{macros_dir}/macros.ghc
|
install -p -D -m 0644 %{SOURCE0} %{buildroot}/%{macros_dir}/macros.ghc
|
||||||
install -p -D -m 0644 %{SOURCE6} ${RPM_BUILD_ROOT}/%{macros_dir}/macros.ghc-extra
|
install -p -D -m 0644 %{SOURCE6} %{buildroot}/%{macros_dir}/macros.ghc-extra
|
||||||
|
|
||||||
install -p -D -m 0755 %{SOURCE3} %{buildroot}/%{_prefix}/lib/rpm/ghc-deps.sh
|
install -p -D -m 0755 %{SOURCE3} %{buildroot}/%{_prefix}/lib/rpm/ghc-deps.sh
|
||||||
|
|
||||||
@ -90,6 +90,9 @@ EOF
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Oct 15 2013 Jens Petersen <petersen@redhat.com> - 1.2-1
|
||||||
|
- add ghcpkgdocdir, which like _pkgdocdir allows for unversioned haddock dirs
|
||||||
|
|
||||||
* Tue Sep 10 2013 Jens Petersen <petersen@redhat.com> - 1.1.3-1
|
* Tue Sep 10 2013 Jens Petersen <petersen@redhat.com> - 1.1.3-1
|
||||||
- ghc-deps.sh: fix ghc-pkg path when bootstrapping new ghc version
|
- ghc-deps.sh: fix ghc-pkg path when bootstrapping new ghc version
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user