Tweaks for installs into a DESTDIR

[ghc-hetmet.git] / mk / bindist.mk

diff --git a/mk/bindist.mk b/mk/bindist.mk
index 2ab0259..3018f51 100644 (file)
--- a/mk/bindist.mk
+++ b/mk/bindist.mk
@@ -5,6 +5,10 @@ EXE_DIST_DIR = dist-install
 # XXX This is a bit of a mess. Really we should be just asking Cabal
 # what it would install and putting those files in the bindist.
 binary-dist:
+ifeq "$(WHERE_AM_I)" ""
+       echo "I don't know where I am" >&2
+       exit 1
+endif
        # General bits
        -find . -name Makefile                      -exec echo $(WHERE_AM_I)/{} \; >> $(BIN_DIST_LIST) 2> /dev/null
        -find . -name LICENSE                       -exec echo $(WHERE_AM_I)/{} \; >> $(BIN_DIST_LIST) 2> /dev/null
@@ -22,7 +26,7 @@ binary-dist:
        # Executables
        -find . -name "*.wrapper"                   -exec echo $(WHERE_AM_I)/{} \; >> $(BIN_DIST_LIST) 2> /dev/null
        -find $(EXE_DIST_DIR)/setup-config          -exec echo $(WHERE_AM_I)/{} \; >> $(BIN_DIST_LIST) 2> /dev/null
-       -find $(EXE_DIST_DIR) -perm /a+x            -exec echo $(WHERE_AM_I)/{} \; >> $(BIN_DIST_LIST) 2> /dev/null
+       -find $(EXE_DIST_DIR) -type f -perm /a+x    -exec echo $(WHERE_AM_I)/{} \; >> $(BIN_DIST_LIST) 2> /dev/null
        # And anything else
 ifneq "$(BINDIST_EXTRAS)" ""
        for FILE in $(BINDIST_EXTRAS); do if [ -e $$FILE ]; then echo $(WHERE_AM_I)/$$FILE >> $(BIN_DIST_LIST); fi; done