diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2020-02-20 18:30:49 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-02-20 21:56:23 -0500 |
| commit | 3cea67955a5ae7d3de7aa9dcfdabaf6ee3681ffc (patch) | |
| tree | a3858bfd4dfee42f0d9ad02d6272c36c9a0863e0 | |
| parent | 33fa8d9433d82b03f3209698bf27420a32302321 (diff) | |
| download | haskell-3cea67955a5ae7d3de7aa9dcfdabaf6ee3681ffc.tar.gz | |
Make: fix sdist target (#17848)
| -rw-r--r-- | ghc.mk | 4 | ||||
| -rw-r--r-- | rules/sdist-ghc-file.mk | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -1217,8 +1217,8 @@ sdist-ghc-prep-tree : # Add files generated by alex and happy. # These rules depend on sdist-ghc-prep-tree. -$(eval $(call sdist-ghc-file,compiler,stage2,GHC,Cmm,Lexer,x)) -$(eval $(call sdist-ghc-file,compiler,stage2,GHC,Cmm,Parser,y)) +$(eval $(call sdist-ghc-file,compiler,stage2,.,GHC/Cmm/Lexer,x)) +$(eval $(call sdist-ghc-file,compiler,stage2,.,GHC/Cmm/Parser,y)) $(eval $(call sdist-ghc-file,compiler,stage2,parser,Lexer,x)) $(eval $(call sdist-ghc-file,compiler,stage2,parser,Parser,y)) $(eval $(call sdist-ghc-file,utils/hpc,dist-install,,HpcParser,y)) diff --git a/rules/sdist-ghc-file.mk b/rules/sdist-ghc-file.mk index 99264488c4..81e1c5c105 100644 --- a/rules/sdist-ghc-file.mk +++ b/rules/sdist-ghc-file.mk @@ -37,7 +37,7 @@ sdist_$1_$2_$4 : sdist-ghc-prep-tree # Generate the .hs files if they don't exist yet, then do actual copying and # moving. sdist_$1_$2_$4 : $1/$2/build/$4.hs - "$(CP)" $1/$2/build/$4.hs $(SRC_DIST_GHC_DIR)/$1/$3 + "$(CP)" $1/$2/build/$4.hs $(SRC_DIST_GHC_DIR)/$1/$3/$$(dir $4) mv $(SRC_DIST_GHC_DIR)/$1/$3/$4.$5 $(SRC_DIST_GHC_DIR)/$1/$3/$4.$5.source # And make sure the rules for generating the .hs files exist, even when we |