1 patch for repository http://darcs.haskell.org/haddock2:
Wed Sep 29 22:48:17 EEST 2010 Sergei Trofimovich <[email protected]> * Avoid installing symlink to haddoc when wrapper installation is disabled
New patches: [Avoid installing symlink to haddoc when wrapper installation is disabled Sergei Trofimovich <[email protected]>**20100929194817 Ignore-this: b5c2afe661036f5d2bd73a671794ce9c ] { hunk ./ghc.mk 24 "$(CP)" -R utils/haddock/latex $@ endif +endif ifeq "$(HADDOCK_DOCS)" "NO" utils/haddock_dist_NOT_NEEDED = YES hunk ./ghc.mk 51 $(foreach i,$(utils/haddock_dist_DATA_FILES), \ $(call make-command,$(INSTALL_DATA) $(INSTALL_OPTS) utils/haddock/$i "$(DESTDIR)$(ghclibdir)/$(dir $i)")) +# no wrapper - no symlink +ifeq "$(utils/haddock_dist_INSTALL_SHELL_WRAPPER)" "YES" ifeq "$(Windows)" "NO" install: install_haddock_link .PNONY: install_haddock_link hunk ./ghc.mk 60 "$(RM)" $(RM_OPTS) "$(DESTDIR)$(bindir)/haddock" $(LN_S) haddock-$(ProjectVersion) "$(DESTDIR)$(bindir)/haddock" endif +endif BINDIST_EXTRAS += $(addprefix utils/haddock/,$(utils/haddock_dist_DATA_FILES)) } Context: [Bump GHC dep Ian Lynagh <[email protected]>**20100922153620 Ignore-this: 2aaed5a34e17dc3d52f44e1cc101dfb8 ] [Fix up __GLASGOW_HASKELL__ tests Ian Lynagh <[email protected]>**20100921151202] [Bump GHC dep upper bound Ian Lynagh <[email protected]>**20100921150110 Ignore-this: 2822f23bd9b480e4f0cd43f857d6a8f0 ] [Fixes for when HADDOCK_DOCS=NO Ian Lynagh <[email protected]>**20100921213951 Ignore-this: 6bfdb32f05bcb95b4ec13a0c35d0848a ] [Don't build haddock is HADDOCK_DOCS is NO Ian Lynagh <[email protected]>**20100921203135 Ignore-this: c47d7fe204ebba4a13a44bc942b51a24 ] [Remove duplicate Outputable instance for Data.Map.Map Ian Lynagh <[email protected]>**20100915103718] [Adapt to minor changes in internal GHC functions [email protected]**20100913095300 Ignore-this: c73c150a58163b0ae9a6a149cd60987a ] [H.Utils needs FFI on Win+MinGW David Waern <[email protected]>**20100902192748 Ignore-this: df35ddfaf4cd7bfbbd2e28c12f1f73ab ] [Add a note to ANNOUNCE David Waern <[email protected]>**20100902192708 Ignore-this: 7473d17bd24a0e5efa82e3c5d6a7a356 ] [TAG 2.8.0 David Waern <[email protected]>**20100902114656 Ignore-this: 793ff8e1a56bc227c8720e6adb3871c1 ] Patch bundle hash: af62f4abd82486e8971b9488e0b1af043da9f598
_______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
