install fixes, small cleanups

[lyx.git] / lib / Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index be62e535b5e9b066ebdc1697c33ede20bf838fb4..31d78c04928a10db26dc0de27ecd7f85a372f969 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -19,7 +19,7 @@ TEXSUPPORT = tex/*.cls
 UI = ui/*.ui
 
 LIBINSTFILES = $(BIND) $(CLIPART) $(DOCINST) $(EXAMPLES) $(IMAGES) $(KBD) \
-       $(LAYOUT) $(TEMPL) $(TEXSUPPORT) $(UI) $(LYXSCRIPTS)
+       $(LAYOUT) $(TEMPL) $(TEXSUPPORT) $(UI)
 
 LIBDISTFILES = $(BIND) $(CLIPART) $(DOCDIST) $(EXAMPLES) $(IMAGES) $(KBD) \
        $(LAYOUT) $(TEMPL) $(UI) $(TEXSUPPORT) $(LYXSCRIPTS)
@@ -46,11 +46,21 @@ install-data-local: libinstalldirs
           $(INSTALL_DATA) ${srcdir}/$$i $(DESTDIR)$(pkgdatadir)/$$i ; \
        done
 
+install-exec-local: libinstalldirs
+       files=`cd ${srcdir} ; echo $(LYXSCRIPTS)` ; \
+       for i in $${files} ; do \
+          $(INSTALL_SCRIPT) ${srcdir}/$$i $(DESTDIR)$(pkgdatadir)/$$i ; \
+       done
+
 uninstall-local:
        @$(NORMAL_UNINSTALL)
-       files=`cd ${srcdir} ; echo $(LIBINSTFILES)` ; \
+       files=`cd ${srcdir} ; echo $(LIBINSTFILES) $(LYXSCRIPTS)` ; \
        for i in $${files} ; do \
           rm -f $(pkgdatadir)/$$i ; \
+       done ; \
+       dirs=`cd ${srcdir} ; echo $(LYXLIBDIRS)` ; \
+       for i in $${dirs} ; do \
+          rm -rf $(pkgdatadir)/$$i ; \
        done
 
 dist-hook: