From c3b27348ccecbfd8f2079bc32ca555f1a915b331 Mon Sep 17 00:00:00 2001 From: fiddlosopher Date: Wed, 15 Aug 2007 21:51:38 +0000 Subject: Simplified Makefile install-all and uninstall-all targets. git-svn-id: https://pandoc.googlecode.com/svn/trunk@853 788f1e2b-df1e-0410-8736-df70ead52e1b --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index e38cea785..43741e890 100644 --- a/Makefile +++ b/Makefile @@ -152,7 +152,7 @@ haddock: build-lib-doc cleanup_files+=html html/: configure -rm -rf html - $(BUILDCMD) haddock && mv $(BUILDDIR)/doc/html . + $(BUILDCMD) haddock && cp -r $(BUILDDIR)/doc/html . .PHONY: build-all build-all: build-program build-lib-doc @@ -203,9 +203,9 @@ uninstall-exec: install-program: install-exec install-doc uninstall-program: uninstall-exec uninstall-doc -# Install everything. .PHONY: install-all uninstall-all -install-all: build-exec install-doc install-lib-doc +# Install libraries +install-all: build-all install-doc install-lib-doc # Install the library (+ main executable) and register it. destdir=$(DESTDIR); \ # Older Cabal versions have no '--destdir' option. @@ -219,7 +219,7 @@ install-all: build-exec install-doc install-lib-doc # Note that, we are in the position of having to install the wrappers # separately, as Cabal installs the main exec along with the library. $(call install-executable-files,$(WRAPPERS),$(BINPATH)) -uninstall-all: uninstall-exec uninstall-doc uninstall-lib-doc +uninstall-all: uninstall-program 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