diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2021-07-06 17:37:10 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-07-27 12:01:51 -0400 |
| commit | e4c252619ebb0b10db9061b052ddce6f8f2b5c72 (patch) | |
| tree | 08cc16137a121134d7fe39f78dfdc20ff401d86d | |
| parent | 888eadb9eb8350ffac348f34ae805e11061cc980 (diff) | |
| download | haskell-e4c252619ebb0b10db9061b052ddce6f8f2b5c72.tar.gz | |
packaging: Give ghc-pkg the same version as ProjectVersion
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | hadrian/src/Rules/Configure.hs | 1 | ||||
| -rw-r--r-- | utils/ghc-pkg/ghc-pkg.cabal.in (renamed from utils/ghc-pkg/ghc-pkg.cabal) | 2 |
4 files changed, 4 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 6c9b992fd4..6d518555ce 100644 --- a/.gitignore +++ b/.gitignore @@ -199,6 +199,7 @@ _darcs/ /utils/mkUserGuidePart/mkUserGuidePart.cabal /utils/runghc/runghc.cabal /utils/gen-dll/gen-dll.cabal +/utils/ghc-pkg/ghc-pkg.cabal utils/lndir/fs.* utils/unlit/fs.* rts/fs.* diff --git a/configure.ac b/configure.ac index b91c86f1ba..1b9ebd309f 100644 --- a/configure.ac +++ b/configure.ac @@ -1430,6 +1430,7 @@ AC_CONFIG_FILES( driver/ghci/ghci-wrapper.cabal utils/iserv/iserv.cabal utils/iserv-proxy/iserv-proxy.cabal + utils/ghc-pkg/ghc-pkg.cabal utils/remote-iserv/remote-iserv.cabal utils/gen-dll/gen-dll.cabal libraries/ghc-boot/ghc-boot.cabal diff --git a/hadrian/src/Rules/Configure.hs b/hadrian/src/Rules/Configure.hs index 10870b3e7c..6787bacf04 100644 --- a/hadrian/src/Rules/Configure.hs +++ b/hadrian/src/Rules/Configure.hs @@ -21,6 +21,7 @@ configureResults = , "utils/iserv/iserv.cabal" , "utils/iserv-proxy/iserv-proxy.cabal" , "utils/remote-iserv/remote-iserv.cabal" + , "utils/ghc-pkg/ghc-pkg.cabal" , "utils/runghc/runghc.cabal" , "utils/gen-dll/gen-dll.cabal" , "libraries/ghc-boot/ghc-boot.cabal" diff --git a/utils/ghc-pkg/ghc-pkg.cabal b/utils/ghc-pkg/ghc-pkg.cabal.in index 13f47c0c3e..d299c98372 100644 --- a/utils/ghc-pkg/ghc-pkg.cabal +++ b/utils/ghc-pkg/ghc-pkg.cabal.in @@ -1,6 +1,6 @@ Name: ghc-pkg -- XXX Version number -Version: 6.9 +Version: @ProjectVersion@ Copyright: XXX License: BSD3 -- XXX License-File: LICENSE |