* 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
This commit is contained in:
roktas 2006-10-30 05:40:41 +00:00
parent db9cebdf91
commit fe92360ea2
2 changed files with 5 additions and 4 deletions

View file

@ -52,7 +52,7 @@ GHC_PKG := ghc-pkg
#-------------------------------------------------------------------------------
.PHONY: all
all: build
all: $(BINS)
.PHONY: templates
templates: $(SRCDIR)/templates
@ -136,7 +136,7 @@ install-all: install-doc install-lib-doc
destdir=$(DESTDIR); destdir=$${destdir:-/}; \
$(BUILDCMD) copy --destdir=$$destdir; \
$(BUILDCMD) register
uninstall-all: uninstall-doc uninstall-lib-doc
uninstall-all: uninstall-exec uninstall-doc uninstall-lib-doc
-pkg_id="$(NAME)-$(VERSION)"; \
libdir=$$($(GHC_PKG) field $$pkg_id library-dirs 2>/dev/null | \
sed 's/^library-dirs: *//'); \

View file

@ -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