Commit 04a42d01 authored by Simon Marlow's avatar Simon Marlow

we need to add utils/pwd to a binary distribution

parent 2b9696a5
......@@ -1099,13 +1099,15 @@ AC_MSG_CHECKING(for path to top of build tree)
dnl This would be
dnl make -C utils/pwd clean && make -C utils/pwd
dnl except we don't want to have to know what make is called. Sigh.
cd utils/pwd
rm -f *.o
rm -f *.hi
rm -f pwd
rm -f pwd.exe
$WithGhc -v0 --make pwd -o pwd
cd ../..
if test ! -e utils/pwd/pwd && ! -e utils/pwd/pwd.exe; then
cd utils/pwd
rm -f *.o
rm -f *.hi
rm -f pwd
rm -f pwd.exe
$WithGhc -v0 --make pwd -o pwd
cd ../..
fi
hardtop=`utils/pwd/pwd forwardslash`
......
......@@ -3,7 +3,7 @@ include $(TOP)/mk/boilerplate.mk
ifeq "$(DOING_BIN_DIST)" "YES"
# We're doing a binary-dist, descend into a subset of the dirs.
SUBDIRS = mkdirhier ghc-pkg hasktags hp2ps hsc2hs parallel prof unlit runghc hpc
SUBDIRS = mkdirhier ghc-pkg hasktags hp2ps hsc2hs parallel prof unlit runghc hpc pwd
else
ifeq "$(BootingFromHc)" "YES"
SUBDIRS = mkdependC mkdirhier runstdtest genapply genprimopcode ghc-pkg unlit
......
TOP=../..
include $(TOP)/mk/boilerplate.mk
# We don't include any of the boilerplate Makefiles as we are used
# by configure. GHC should be overridden on the command line to the
# GHC that you want to use.
HS_PROG=pwd
GHC=ghc
.PHONY: all clean
all:
$(GHC) --make pwd
clean:
rm -f *.o
rm -f *.hi
rm -f pwd
rm -f pwd.exe
binary-dist:
$(INSTALL_DIR) $(BIN_DIST_DIR)/utils/pwd
$(INSTALL_DATA) Makefile $(BIN_DIST_DIR)/utils/pwd/
$(INSTALL_PROGRAM) pwd$(exeext) $(BIN_DIST_DIR)/utils/pwd/
include $(TOP)/mk/target.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