Commit 36091517 authored by Ian Lynagh's avatar Ian Lynagh

Rename pwd to ghc-pwd

parent ed4beb8b
...@@ -1243,19 +1243,19 @@ AC_DEFUN([FP_FIND_ROOT],[ ...@@ -1243,19 +1243,19 @@ AC_DEFUN([FP_FIND_ROOT],[
AC_MSG_CHECKING(for path to top of build tree) AC_MSG_CHECKING(for path to top of build tree)
dnl This would be dnl This would be
dnl make -C utils/pwd clean && make -C utils/pwd dnl make -C utils/ghc-pwd clean && make -C utils/ghc-pwd
dnl except we don't want to have to know what make is called. Sigh. dnl except we don't want to have to know what make is called. Sigh.
if test ! -f utils/pwd/pwd && test ! -f utils/pwd/pwd.exe; then if test ! -f utils/ghc-pwd/ghc-pwd && test ! -f utils/ghc-pwd/ghc-pwd.exe; then
cd utils/pwd cd utils/ghc-pwd
rm -f *.o rm -f *.o
rm -f *.hi rm -f *.hi
rm -f pwd rm -f ghc-pwd
rm -f pwd.exe rm -f ghc-pwd.exe
$WithGhc -v0 --make pwd -o pwd $WithGhc -v0 --make ghc-pwd -o ghc-pwd
cd ../.. cd ../..
fi fi
hardtop=`utils/pwd/pwd` hardtop=`utils/ghc-pwd/ghc-pwd`
if ! test -d "$hardtop"; then if ! test -d "$hardtop"; then
AC_MSG_ERROR([cannot determine current directory]) AC_MSG_ERROR([cannot determine current directory])
......
...@@ -722,7 +722,7 @@ $(eval $(call bindist,.,\ ...@@ -722,7 +722,7 @@ $(eval $(call bindist,.,\
mk/config.mk.in \ mk/config.mk.in \
$(INPLACE_BIN)/mkdirhier \ $(INPLACE_BIN)/mkdirhier \
$(INPLACE_BIN)/ghc-cabal \ $(INPLACE_BIN)/ghc-cabal \
utils/pwd/pwd \ utils/ghc-pwd/ghc-pwd \
$(BINDIST_WRAPPERS) \ $(BINDIST_WRAPPERS) \
$(BINDIST_LIBS) \ $(BINDIST_LIBS) \
$(BINDIST_HI) \ $(BINDIST_HI) \
...@@ -865,7 +865,10 @@ endif ...@@ -865,7 +865,10 @@ endif
.PHONY: clean .PHONY: clean
CLEAN_FILES += utils/pwd/pwd utils/pwd/pwd.exe utils/pwd/pwd.hi utils/pwd/pwd.o CLEAN_FILES += utils/ghc-pwd/ghc-pwd
CLEAN_FILES += utils/ghc-pwd/ghc-pwd.exe
CLEAN_FILES += utils/ghc-pwd/ghc-pwd.hi
CLEAN_FILES += utils/ghc-pwd/ghc-pwd.o
clean : clean_files clean : clean_files
.PHONY: clean_files .PHONY: clean_files
......
Name: pwd Name: ghc-pwd
Version: 0.1 Version: 0.1
Copyright: XXX Copyright: XXX
License: BSD License: BSD
...@@ -14,8 +14,8 @@ cabal-version: >=1.2 ...@@ -14,8 +14,8 @@ cabal-version: >=1.2
Flag base3 Flag base3
Description: Choose the new smaller, split-up base package. Description: Choose the new smaller, split-up base package.
Executable pwd Executable ghc-pwd
Main-Is: pwd.hs Main-Is: ghc-pwd.hs
if flag(base3) if flag(base3)
Build-Depends: base >= 3 && < 5, Build-Depends: base >= 3 && < 5,
directory >= 1 && < 1.1 directory >= 1 && < 1.1
......
...@@ -13,7 +13,7 @@ main = do ...@@ -13,7 +13,7 @@ main = do
[] -> do d <- getCurrentDirectory [] -> do d <- getCurrentDirectory
putStr $ map forwardifySlashes d putStr $ map forwardifySlashes d
_ -> do hPutStrLn stderr ("Bad args: " ++ show args) _ -> do hPutStrLn stderr ("Bad args: " ++ show args)
hPutStrLn stderr "Usage: pwd" hPutStrLn stderr "Usage: ghc-pwd"
exitFailure exitFailure
forwardifySlashes :: Char -> Char forwardifySlashes :: Char -> Char
......
...@@ -80,7 +80,7 @@ if [ $no_clean -eq 0 ]; then ...@@ -80,7 +80,7 @@ if [ $no_clean -eq 0 ]; then
./configure --prefix="$INSTDIR" $config_args ./configure --prefix="$INSTDIR" $config_args
fi fi
thisdir=`utils/pwd/pwd` thisdir=`utils/ghc-pwd/ghc-pwd`
echo "Validating=YES" > mk/are-validating.mk echo "Validating=YES" > mk/are-validating.mk
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment