diff options
| author | Ian Lynagh <igloo@earth.li> | 2008-09-24 12:41:37 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2008-09-24 12:41:37 +0000 |
| commit | eda26ed7cf401fcf468b3c8e2a5f494f9f1fce34 (patch) | |
| tree | 192bbc9a30aeedfa5fcf3999ad15b27353313587 /mk | |
| parent | 9f3483fa8aaa7bfbf62f6a57b94a5b784b160123 (diff) | |
| download | haskell-eda26ed7cf401fcf468b3c8e2a5f494f9f1fce34.tar.gz | |
Use -perm -100 rather than -perm /a+x when looking for executable files
/a+x doesn't work on some Solaris and OS X machines. Spotted by
Christian Maeder.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bindist.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mk/bindist.mk b/mk/bindist.mk index 7e5f31bbce..c4ef66e290 100644 --- a/mk/bindist.mk +++ b/mk/bindist.mk @@ -25,7 +25,12 @@ endif # 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) -type f -perm /a+x -exec echo $(WHERE_AM_I)/{} \; >> $(BIN_DIST_LIST) 2> /dev/null + # We want the executable files, which in theory would be -perm /a+x + # ("any execute bit is set") but that doesn't work on some solaris + # and OS X machines, so we use -perm -100 instead ("the user execute + # bit is set"). In practice, this is extremely unlikely not to be the + # same set of files. + -$(FIND) $(EXE_DIST_DIR) -type f -perm -100 -exec echo $(WHERE_AM_I)/{} \; >> $(BIN_DIST_LIST) 2> /dev/null # Docs # This gives us both docbook docs, and haddock docs $(FIND) . -name "*.haddock" -exec echo $(WHERE_AM_I)/{} \; >> $(BIN_DIST_LIST) 2> /dev/null |