audio chan pos rework, batchrender deadlock, titler/crikey grab_event tweak, thread...

[goodguy/history.git] / cinelerra-5.1 / Makefile.am

diff --git a/cinelerra-5.1/Makefile.am b/cinelerra-5.1/Makefile.am
index a6426923cb64cb5da95603f0ae5bb31815ded62c..0667d93ce2c1ad576bf8a7d742b42f8913eb33b8 100644 (file)
--- a/cinelerra-5.1/Makefile.am
+++ b/cinelerra-5.1/Makefile.am
@@ -31,12 +31,16 @@ export mkinstalldirs install_sh inst_sh
 
 # install to bin
 binstall:      install-recursive
-       cp -a COPYING README models ffmpeg msg info tips bin/.
+       cp -a COPYING README models Cinelerra_factory ffmpeg msg info tips bin/.
        sed -e 's/\<cin\>/$(WANT_CIN)/g' < image/cin.desktop \
                > "bin/applications/$(WANT_CIN).desktop"
        cp -a image/cin.svg "bin/pixmaps/$(WANT_CIN)".svg
        cp -a image/cin.xpm "bin/pixmaps/$(WANT_CIN)".xpm
-       for d in picon*; do cp -a $$d/. bin/plugins/$$d/.; done
+       mkdir -p bin/plugins/picon/cinfinity
+       for d in picon/*; do \
+         if [ $$d = picon/cinfinity ]; then continue; fi; \
+         cp -a $$d bin/plugins/picon/.; \
+       done
        cp -a db/utils/new_db "bin/cin_db"
 
 buninstall:
@@ -49,7 +53,7 @@ cinstall:
        cd bin; $(inst_sh) "$(DESTDIR)$(WANT_CINLIB_DIR)" \
                bdwrite cutads hveg2enc mpeg2enc mplex mplexlo
        cd bin; $(inst_sh) "$(DESTDIR)$(datadir)/$(WANT_CIN)" \
-               COPYING README models ffmpeg msg info tips doc
+               COPYING README models Cinelerra_factory ffmpeg msg info tips doc
        cd bin/locale; $(inst_sh) "$(DESTDIR)$(localedir)" .
        cd bin/plugins; $(inst_sh) "$(DESTDIR)$(WANT_PLUGIN_DIR)" .
        cd bin/ladspa; $(inst_sh) "$(DESTDIR)$(WANT_LADSPA_DIR)" .