Permalink
Browse files

Fix #118 by properly installing Haddock, and cleaning its library pa…

…th during install.
  • Loading branch information...
acw committed Apr 20, 2017
1 parent 65fad65 commit 62052b2b88fd7fe6055fcb21889c4312b3c0c9bf
Showing with 5 additions and 4 deletions.
  1. +1 −1 Makefile
  2. +1 −1 configure.ac
  3. +2 −1 src/debian/rules.in
  4. +1 −1 src/misc/HaLVM.spec
View
@@ -292,7 +292,7 @@ install:: $(TOPDIR)/src/misc/kernel-$(ARCH).lds
install::
$(INSTALL) -D $(shell $(GHC) --print-libdir)/bin/hsc2hs $(DESTDIR)${halvmlibdir}/bin/hsc2hs.bin
- $(INSTALL) -D $(shell $(GHC) --print-libdir)/bin/haddock $(DESTDIR)${halvmlibdir}/bin/haddock.bin
+ $(INSTALL) -D $(shell $(GHC) --print-libdir)/bin/haddock $(DESTDIR)${halvmlibdir}/bin/haddock
# Need to be sure we grab datadirs for alex and happy, /usr/share w.r.t. their prefix
install::
View
@@ -6,7 +6,7 @@ dnl - terms and conditions.
dnl Author: Adam Wick <awick@galois.com>
dnl BANNEREND
AC_PREREQ(2.60)
-AC_INIT(HALVM,2.4.0,awick@galois.com,halvm)
+AC_INIT(HALVM,2.4.1,awick@galois.com,halvm)
dnl -------------------------------------------------------------------------
dnl
View
@@ -36,11 +36,12 @@ override_dh_strip:
chrpath -d debian/$(SUBDIR)/usr/lib/$(ARCH)-linux-gnu/HaLVM-$(VERSION)/bin/cabal
chrpath -d debian/$(SUBDIR)/usr/lib/$(ARCH)-linux-gnu/HaLVM-$(VERSION)/bin/ghc
chrpath -d debian/$(SUBDIR)/usr/lib/$(ARCH)-linux-gnu/HaLVM-$(VERSION)/bin/ghc-pkg
- chrpath -d debian/$(SUBDIR)/usr/lib/$(ARCH)-linux-gnu/HaLVM-$(VERSION)/bin/haddock.bin
chrpath -d debian/$(SUBDIR)/usr/lib/$(ARCH)-linux-gnu/HaLVM-$(VERSION)/bin/happy
chrpath -d debian/$(SUBDIR)/usr/lib/$(ARCH)-linux-gnu/HaLVM-$(VERSION)/bin/HsColour
chrpath -r /usr/lib/$(ARCH)-linux-gnu/HaLVM-$(VERSION)/lib \
debian/$(SUBDIR)/usr/lib/$(ARCH)-linux-gnu/HaLVM-$(VERSION)/bin/hsc2hs.bin
+ chrpath -r /usr/lib/$(ARCH)-linux-gnu/HaLVM-$(VERSION)/lib \
+ debian/$(SUBDIR)/usr/lib/$(ARCH)-linux-gnu/HaLVM-$(VERSION)/bin/haddock
mv debian/$(SUBDIR)/usr/share/doc/ghc* debian/$(SUBDIR)/usr/share/doc/HaLVM-ghc
mkdir -p debian/$(SUBDIR)/usr/share/HaLVM-$(VERSION)
cp -r examples debian/$(SUBDIR)/usr/share/HaLVM-$(VERSION)/
View
@@ -47,9 +47,9 @@ chrpath -d %{buildroot}%{_libdir}/HaLVM-%{version}/bin/alex
chrpath -d %{buildroot}%{_libdir}/HaLVM-%{version}/bin/cabal
chrpath -d %{buildroot}%{_libdir}/HaLVM-%{version}/bin/ghc
chrpath -d %{buildroot}%{_libdir}/HaLVM-%{version}/bin/ghc-pkg
-chrpath -d %{buildroot}%{_libdir}/HaLVM-%{version}/bin/haddock.bin
chrpath -d %{buildroot}%{_libdir}/HaLVM-%{version}/bin/happy
chrpath -r %{_libdir}/HaLVM-%{version}/lib %{buildroot}%{_libdir}/HaLVM-%{version}/bin/hsc2hs.bin
+chrpath -r %{_libdir}/HaLVM-%{version}/lib %{buildroot}%{_libdir}/HaLVM-%{version}/bin/haddock
chrpath -d %{buildroot}%{_libdir}/HaLVM-%{version}/bin/HsColour
rm -rf %{buildroot}share
mv %{buildroot}%{_docdir}/ghc* %{buildroot}%{_docdir}/ghc

0 comments on commit 62052b2

Please sign in to comment.