diff options
| author | Iain Lane <laney@ubuntu.com> | 2009-09-30 19:30:34 +0400 |
|---|---|---|
| committer | Iain Lane <laney@ubuntu.com> | 2009-09-30 19:30:34 +0400 |
| commit | cc2932aaa7b5baa7692bcd552432c76a83a631ef (patch) | |
| tree | 6a3bb38d7312dd2c13620c898a30558342e5fb45 /p/happy | |
| parent | 7aa30578fbae6d35d2256e9eb2153dc5c6bcc2a8 (diff) | |
| download | DHG_packages-cc2932aaa7b5baa7692bcd552432c76a83a631ef.tar.gz | |
happy: Install templates into /usr/share/happy-upversion
Diffstat (limited to 'p/happy')
| -rw-r--r-- | p/happy/debian/changelog | 4 | ||||
| -rw-r--r-- | p/happy/debian/happy.install | 1 | ||||
| -rwxr-xr-x | p/happy/debian/rules | 7 |
3 files changed, 6 insertions, 6 deletions
diff --git a/p/happy/debian/changelog b/p/happy/debian/changelog index 21bedaf3a..eddeec8dc 100644 --- a/p/happy/debian/changelog +++ b/p/happy/debian/changelog @@ -19,9 +19,7 @@ happy (1.18.4-1) UNRELEASED; urgency=low * debian/control, debian/patches/templates_path.patch, debian/rules: Add quilt patchsys and patch Setup.lhs to install templates in out/ directory. They are usually installed in the build root which means there is no easy - way to use dh_install .install files to install them. These files are now - installed into /usr/share/happy instead of /usr/share/happy-<version> as - this can be done without further rules hacks. + way to install them all at once. * debian/rules, debian/control: Upstream doesn't ship doc/configure required for the doc build - use autoconf to generate it at build-time. Requires a build-dep on autoconf. diff --git a/p/happy/debian/happy.install b/p/happy/debian/happy.install index da9b636a4..e3a5b0279 100644 --- a/p/happy/debian/happy.install +++ b/p/happy/debian/happy.install @@ -1,3 +1,2 @@ dist-ghc6/build/happy/happy usr/bin doc/happy/* usr/share/doc/happy/html -out/* usr/share/happy diff --git a/p/happy/debian/rules b/p/happy/debian/rules index 4f3ec9d18..9760d02c4 100755 --- a/p/happy/debian/rules +++ b/p/happy/debian/rules @@ -12,6 +12,7 @@ include /usr/share/cdbs/1/class/hlibrary.mk include /usr/share/cdbs/1/rules/utils.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk + clean:: [ ! -f doc/config.mk ] || $(MAKE) -C doc clean @@ -39,6 +40,8 @@ build/happy:: build-ghc6-stamp -e "s#@VERSION@#`debian/get_version`#g" \ doc/happy.1.in > doc/happy.1 -# templates build a load of bak files which we don't want +# install templates to appropriate directory binary-post-install/happy:: - rm -f $(CURDIR)/debian/happy/usr/share/happy/*bak + 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`/ |