diff options
| author | Ian Lynagh <igloo@earth.li> | 2007-10-23 23:46:24 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2007-10-23 23:46:24 +0000 |
| commit | 4217c6caef9f6d261df1449c590331878a493f14 (patch) | |
| tree | 328da29981b6149db8b308df37cb3b77e9ad00a4 /distrib | |
| parent | dc5fc2a6d44009577f5d1ba6a403ed5e1ab22af5 (diff) | |
| download | haskell-4217c6caef9f6d261df1449c590331878a493f14.tar.gz | |
Fix installing the documentation in the bindists
Diffstat (limited to 'distrib')
| -rw-r--r-- | distrib/Makefile | 37 | ||||
| -rw-r--r-- | distrib/Makefile-bin-vars.in | 2 |
2 files changed, 11 insertions, 28 deletions
diff --git a/distrib/Makefile b/distrib/Makefile index 06c1f2947f..adf39ac1fd 100644 --- a/distrib/Makefile +++ b/distrib/Makefile @@ -1,7 +1,7 @@ include Makefile-vars -.PHONY: mk-version-symlinks install +.PHONY: install postinstall denounce show-install-setup #.PHONY: in-place # This has bitrotted: @@ -16,20 +16,18 @@ include Makefile-vars install :: $(INSTALL_DIR) $(bindir) - (cd share; find . -type d -exec sh -c '$(INSTALL_DIR) $(datadir)/$$0' {} \; ) install:: - $(MAKE) -C includes install DOING_BIN_DIST=YES - $(MAKE) -C driver install DOING_BIN_DIST=YES - $(MAKE) -C utils install DOING_BIN_DIST=YES - $(MAKE) -C rts install DOING_BIN_DIST=YES - $(MAKE) -C libraries install DOING_BIN_DIST=YES - $(MAKE) -C compiler install DOING_BIN_DIST=YES + $(MAKE) -C includes install DOING_BIN_DIST=YES + $(MAKE) -C driver install DOING_BIN_DIST=YES + $(MAKE) -C utils install DOING_BIN_DIST=YES + $(MAKE) -C rts install DOING_BIN_DIST=YES + $(MAKE) -C libraries install DOING_BIN_DIST=YES + $(MAKE) -C compiler install DOING_BIN_DIST=YES + $(MAKE) -C docs install-docs DOING_BIN_DIST=YES $(INSTALL_DATA) $(INSTALL_OPTS) extra-gcc-opts $(libdir) -install :: install-docs postinstall denounce - -.PHONY: postinstall denounce +install :: postinstall denounce denounce: @echo @@ -60,20 +58,3 @@ show-install-setup: @echo "libdir = $(libdir) (libdir = $(libdir))" @echo "datadir = $(datadir) (datadir = $(datadir))" -# -# Documentation targets: install-docs. -# - -.PHONY: show-install-setup install-docs install-dirs-docs - -install-docs : install-dirs-docs - if test -d share/html ; then $(CP) -r share/html/* $(htmldir) ; fi - set -e; for i in share/*.ps; do \ - if test -f "$$i"; then \ - $(CP) $$i $(psdir) ; \ - fi \ - done - -install-dirs-docs: - $(INSTALL_DIR) $(htmldir) - diff --git a/distrib/Makefile-bin-vars.in b/distrib/Makefile-bin-vars.in index f6b59ed65e..1b5b8fa71f 100644 --- a/distrib/Makefile-bin-vars.in +++ b/distrib/Makefile-bin-vars.in @@ -18,6 +18,8 @@ platform = @TargetPlatform@ prefix = @prefix@ exec_prefix = @exec_prefix@ +mandir = $(datarootdir)/man + headerdir = $(libdir)/include # default |