install fixes, small cleanups

[lyx.git] / lib / Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 1e3cd02a918c26be8883710bf86553456b35cf27..31d78c04928a10db26dc0de27ecd7f85a372f969 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,7 +1,6 @@
 AUTOMAKE_OPTIONS = foreign
 DISTCLEANFILES = *.orig *.rej *~ *.bak core textclass.lst packages.lst \
                lyxrc.defaults doc/LyXConfig.lyx
-pkgdata_SCRIPTS = configure configure.cmd
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in listerrors
 SUBDIRS = reLyX
 bin_SCRIPTS = listerrors
@@ -14,13 +13,13 @@ EXAMPLES = examples/*.lyx
 IMAGES = images/*.xpm
 KBD = kbd/*.kmap kbd/*.cdef
 LAYOUT = layouts/*.layout layouts/*.inc 
-LYXSCRIPTS = scripts/*
+LYXSCRIPTS = configure configure.cmd scripts/*
 TEMPL = templates/*.lyx
 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)
@@ -47,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: