[Pkg-haskell-commits] darcs: happy: Simplify build setup a bit

[Joachim Breitner]

Tue Feb  7 20:40:07 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Simplify build setup a bit 
  Ignore-this: 1e10b7df254765a3dc99ce7f6aebabbb

    M ./changelog +1
    M ./control -2 +2
    M ./happy.install -1
    R ./patches/
    R ./patches/series
    R ./patches/templates_path.patch
    M ./rules -8 +4

Tue Feb  7 20:40:07 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Simplify build setup a bit 
  Ignore-this: 1e10b7df254765a3dc99ce7f6aebabbb
diff -rN -u old-happy//changelog new-happy//changelog
--- old-happy//changelog	2012-02-07 20:40:55.394254391 +0000
+++ new-happy//changelog	2012-02-07 20:40:55.405751094 +0000
@@ -1,6 +1,7 @@
 happy (1.18.9-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * Simplify build setup a bit 
 
  -- Joachim Breitner <nomeata at debian.org>  Tue, 07 Feb 2012 21:20:10 +0100
 
diff -rN -u old-happy//control new-happy//control
--- old-happy//control	2012-02-07 20:40:55.394254391 +0000
+++ new-happy//control	2012-02-07 20:40:55.397749458 +0000
@@ -13,8 +13,8 @@
                docbook-xsl,
                docbook-xml,
                xsltproc,
-               happy,
-               libghc-mtl-dev
+               libghc-mtl-dev,
+               happy
 Homepage: http://www.haskell.org/happy
 Vcs-Darcs: http://darcs.debian.org/darcs/pkg-haskell/happy
 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/happy
diff -rN -u old-happy//happy.install new-happy//happy.install
--- old-happy//happy.install	2012-02-07 20:40:55.394254391 +0000
+++ new-happy//happy.install	2012-02-07 20:40:55.401756532 +0000
@@ -1,2 +1 @@
-dist-ghc/build/happy/happy usr/bin
 doc/happy/* usr/share/doc/happy/html
diff -rN -u old-happy//patches/series new-happy//patches/series
--- old-happy//patches/series	2012-02-07 20:40:55.394254391 +0000
+++ new-happy//patches/series	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-templates_path.patch
diff -rN -u old-happy//patches/templates_path.patch new-happy//patches/templates_path.patch
--- old-happy//patches/templates_path.patch	2012-02-07 20:40:55.394254391 +0000
+++ new-happy//patches/templates_path.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-Build these templates in out/ to make it easier to install them. Otherwise they are installed in the buildroot which would make for a messy install file.
-
-Index: happy-1.18.6/Setup.lhs
-===================================================================
---- happy-1.18.6.orig/Setup.lhs	2010-11-17 17:00:24.000000000 +0530
-+++ happy-1.18.6/Setup.lhs	2011-03-29 13:58:16.000000000 +0530
-@@ -33,9 +33,9 @@
-         runProgram ghcProgram (["-o", dst, "-E", "-cpp", "templates" </> src] ++ opts)
- 	runProgram perlProgram ["-i.bak", "-pe", crazy_perl_regexp, dst]
- 
--  sequence_ ([ cpp_template "GenericTemplate.hs" dst opts | (dst,opts) <- templates ] ++
--             [ cpp_template "GLR_Base.hs"       dst opts | (dst,opts) <- glr_base_templates ] ++
--             [ cpp_template "GLR_Lib.hs"        dst opts | (dst,opts) <- glr_templates ])
-+  sequence_ ([ cpp_template "GenericTemplate.hs" ("out/" ++ dst) opts | (dst,opts) <- templates ] ++
-+             [ cpp_template "GLR_Base.hs"       ("out/" ++ dst) opts | (dst,opts) <- glr_base_templates ] ++
-+             [ cpp_template "GLR_Lib.hs"        ("out/" ++ dst) opts | (dst,opts) <- glr_templates ])
- 
- myPostClean _ _ _ _ = mapM_ (try . removeFile) all_template_files
- 
diff -rN -u old-happy//rules new-happy//rules
--- old-happy//rules	2012-02-07 20:40:55.394254391 +0000
+++ new-happy//rules	2012-02-07 20:40:55.401756532 +0000
@@ -7,6 +7,8 @@
 
 DEB_BUILD_DEPENDENCIES = build-arch
 
+DEB_SETUP_GHC_CONFIGURE_ARGS := --datasubdir=/usr/share/happy --docdir=/usr/share/doc/happy
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk
 include /usr/share/cdbs/1/rules/utils.mk
@@ -16,7 +18,6 @@
 
 	rm -f debian/get_version.o debian/get_version.hi debian/get_version
 	rm -f doc/happy.1
-	rm -rf out
 
 	# Hacks:
 	rm -f doc/config.log doc/config.status doc/config.mk doc/configure
@@ -24,10 +25,6 @@
 configure/happy::
 	# doc/configure is not shipped, generate it
 	cd doc && autoconf && rm -r autom4te.cache &&  ./configure --prefix=/usr
-
-	# make directory for the templates
-	[ -d out ] || mkdir out
-
 	# used in build to stick version into man page
 	ghc --make debian/get_version.hs -o debian/get_version
 
@@ -40,6 +37,5 @@
 
 # install templates to appropriate directory
 binary-post-install/happy::
-	rm -f $(CURDIR)/out/*bak
-	mkdir -p           $(CURDIR)/debian/happy/usr/share/happy-`debian/get_version`/
-	cp $(CURDIR)/out/* $(CURDIR)/debian/happy/usr/share/happy-`debian/get_version`/
+	$(DEB_SETUP_BIN_NAME) copy --builddir=dist-ghc --destdir=debian/happy
+	rm -f debian/happy/usr/share/doc/happy/LICENSE