[Pkg-haskell-commits] darcs: haskell-hoogle: Datadir has no version number

[kiwamu at debian.or.jp]

Sun Sep  9 10:31:07 UTC 2012  kiwamu at debian.or.jp
  * Datadir has no version number
  Ignore-this: 4eac406c1456a1e6de4f06e893d3369f

    M ./hoogle.install -1 +1
    M ./hoogle.links +1
    M ./rules -4 +5

Sun Sep  9 10:31:07 UTC 2012  kiwamu at debian.or.jp
  * Datadir has no version number
  Ignore-this: 4eac406c1456a1e6de4f06e893d3369f
diff -rN -u old-haskell-hoogle//hoogle.install new-haskell-hoogle//hoogle.install
--- old-haskell-hoogle//hoogle.install	2012-09-09 10:33:40.050634195 +0000
+++ new-haskell-hoogle//hoogle.install	2012-09-09 10:33:40.057837854 +0000
@@ -1,3 +1,3 @@
 debian/tmp-inst-*/usr/bin/* /usr/bin/
-debian/tmp-inst-*/usr/share/hoogle-* /usr/share/
+debian/tmp-inst-*/usr/share/hoogle /usr/share/
 debian/apache.conf /etc/apache2/conf.d/hoogle
diff -rN -u old-haskell-hoogle//hoogle.links new-haskell-hoogle//hoogle.links
--- old-haskell-hoogle//hoogle.links	2012-09-09 10:33:40.050634195 +0000
+++ new-haskell-hoogle//hoogle.links	2012-09-09 10:33:40.057837854 +0000
@@ -1 +1,2 @@
 usr/bin/hoogle  usr/lib/cgi-bin/hoogle
+var/lib/hoogle/databases  usr/share/hoogle/databases
diff -rN -u old-haskell-hoogle//rules new-haskell-hoogle//rules
--- old-haskell-hoogle//rules	2012-09-09 10:33:40.030325513 +0000
+++ new-haskell-hoogle//rules	2012-09-09 10:33:40.062326949 +0000
@@ -2,9 +2,10 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk
 
+DEB_SETUP_GHC_CONFIGURE_ARGS := --datasubdir=/usr/share/hoogle
+HOOGLE_RESDIR := debian/hoogle/usr/share/hoogle/resources
+
 build/hoogle:: build-ghc-stamp
 binary-fixup/hoogle::
-	cd debian/hoogle/usr/share/hoogle-$(CABAL_VERSION)/ && ln -s /var/lib/hoogle/databases ./
-	cd debian/hoogle/usr/share/ && ln -s hoogle-$(CABAL_VERSION) hoogle
-	sed -i -e "s/res\//\/hoogle\//g" debian/hoogle/usr/share/hoogle-$(CABAL_VERSION)/resources/template.html
-	sed -i -e "s/action=\"\.\"/action=\"\.\/hoogle\"/g" debian/hoogle/usr/share/hoogle-$(CABAL_VERSION)/resources/template.html
+	sed -i -e "s/res\//\/hoogle\//g" $(HOOGLE_RESDIR)/template.html
+	sed -i -e "s/action=\"\.\"/action=\"\.\/hoogle\"/g" $(HOOGLE_RESDIR)/template.html