diff options
| author | roktas <roktas@788f1e2b-df1e-0410-8736-df70ead52e1b> | 2006-10-30 05:40:41 +0000 |
|---|---|---|
| committer | roktas <roktas@788f1e2b-df1e-0410-8736-df70ead52e1b> | 2006-10-30 05:40:41 +0000 |
| commit | fe92360ea2dc3863d3c1bed816037f921706d343 (patch) | |
| tree | ec840736fc0088428916cb9cef02300c22023d0a /cabalize | |
| parent | db9cebdf9152fe1c3ea1ce324a6b2aceb01807fb (diff) | |
| download | pandoc-fe92360ea2dc3863d3c1bed816037f921706d343.tar.gz | |
* cabalize: fix cabal version detection by using a bloody hack.
* Makefile:
+ Make 'uninstall-all' depends on 'uninstall-exec'.
+ Make the default target 'all' depends on $(BINS). Now, invoking
a plain 'make' builds and creates pandoc in the top directory.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@39 788f1e2b-df1e-0410-8736-df70ead52e1b
Diffstat (limited to 'cabalize')
| -rwxr-xr-x | cabalize | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -18,7 +18,7 @@ case "$ghc_version" in 6.4*) BUILD_DEPENDS="${BUILD_DEPENDS} ${GHC64_DEPENDS}" ;; -6.[56]*) +6.[5-9]*) BUILD_DEPENDS="${BUILD_DEPENDS} ${GHC66_DEPENDS}" ;; *) @@ -30,7 +30,8 @@ BUILD_DEPENDS=$(echo $BUILD_DEPENDS | sed -e 's# #, #g') # Handle 'Hs-Source-Dir' option name which was deprecated in Cabal 1.1.4. HS_SOURCE_DIRS='Hs-Source-Dirs' -if ghc-pkg -l | grep -q '\<[Cc]abal-[0-1]\.[0-1]\.[0-3][^,]*'; then +cabal_version=$(ghc-pkg -l | sed -ne 's/.*\<[Cc]abal-\([^,]*\).*/\1/p') +if printf "$cabal_version\n1.1.4" | sort | tail -n 1 | grep -q '1\.1\.4'; then HS_SOURCE_DIRS='Hs-Source-Dir' fi |