Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / micropeak / Makefile.am

diff --git a/micropeak/Makefile.am b/micropeak/Makefile.am
index 23ec077ec4cda796c35f9b4d4970c2ec93621465..9a0328d7a2e2fbf44e5dc3e1260fcda3619cc904 100644 (file)
--- a/micropeak/Makefile.am
+++ b/micropeak/Makefile.am
@@ -137,7 +137,7 @@ MACOSX_DRIVERS=$(MACOSX_DRIVER_1) $(MACOSX_DRIVER_0)
 
 MACOSX_INFO_PLIST=Info.plist
 MACOSX_README=ReadMe-Mac.rtf
-MACOSX_INSTALL=../altosui/install-macosx
+MACOSX_INSTALL=../altosui/install-macosx ../altosui/ask-pass
 MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(MACOSX_DRIVERS) $(MACOSX_README) $(DOC) $(MACOSX_ICONS) $(MACOSX_INSTALL)
 
 $(MACOSX_DRIVER_0):
@@ -315,7 +315,8 @@ $(MACOSX_DIST): $(MACOSX_FILES)
        cp -a MicroPeak.app macosx/
        cp -a $(MACOSX_README) macosx/ReadMe-MicroPeak.rtf
        cp -a $(MACOSX_INSTALL) macosx
-       cp -a $(DOC) macosx
+       mkdir -p macosx/Doc
+       cp -a $(DOC) macosx/Doc
        cp -p Info.plist macosx/MicroPeak.app/Contents
        cp -p $(MACOSX_DRIVERS) macosx
        mkdir -p macosx/MicroPeak.app/Contents/Resources/Java