[commit: ghc] master: Double a couple of $s for consistency (8c24ab9)
Ian Lynagh <[email protected]>
| Newsgroups | gmane.comp.lang.haskell.cvs.ghc |
|---|---|
| Message-ID | <[email protected]> |
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master http://hackage.haskell.org/trac/ghc/changeset/8c24ab98cde96ce20dea6a9280231d978ffc7690 >--------------------------------------------------------------- commit 8c24ab98cde96ce20dea6a9280231d978ffc7690 Author: Ian Lynagh <[email protected]> Date: Sun Oct 14 01:40:04 2012 +0100 Double a couple of $s for consistency >--------------------------------------------------------------- rules/build-package-way.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/build-package-way.mk b/rules/build-package-way.mk index c367863..aa3f277 100644 --- a/rules/build-package-way.mk +++ b/rules/build-package-way.mk @@ -26,7 +26,7 @@ $(call hs-objs,$1,$2,$3) # the first is indexed by the dir, distdir and way # the second is indexed by the package id, distdir and way $1_$2_$3_LIB = $1/$2/build/libHS$$($1_PACKAGE)-$$($1_$2_VERSION)$$($3_libsuf) -$$($1_PACKAGE)-$($1_$2_VERSION)_$2_$3_LIB = $$($1_$2_$3_LIB) +$$($1_PACKAGE)-$$($1_$2_VERSION)_$2_$3_LIB = $$($1_$2_$3_LIB) # Note [inconsistent distdirs] # hack: the DEPS_LIBS mechanism assumes that the distdirs for packages @@ -35,7 +35,7 @@ $$($1_PACKAGE)-$($1_$2_VERSION)_$2_$3_LIB = $$($1_$2_$3_LIB) # Really we should use a consistent scheme for distdirs, but in the # meantime we work around it by defining ghc-<ver>_dist-install_way_LIB: ifeq "$$($1_PACKAGE) $2" "ghc stage2" -$$($1_PACKAGE)-$($1_$2_VERSION)_dist-install_$3_LIB = $$($1_$2_$3_LIB) +$$($1_PACKAGE)-$$($1_$2_VERSION)_dist-install_$3_LIB = $$($1_$2_$3_LIB) endif # All the .a/.so library file dependencies for this library.