From fe92360ea2dc3863d3c1bed816037f921706d343 Mon Sep 17 00:00:00 2001 From: roktas Date: Mon, 30 Oct 2006 05:40:41 +0000 Subject: * 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 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 60afaea8b..b3b68bc45 100644 --- a/Makefile +++ b/Makefile @@ -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: *//'); \ -- cgit v1.2.3