now I hope it installs correctly...

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@200 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index be17671464a385a2e5daba479a658b82cfcd8995..1a0e774449f90a69d930a21b63e24c3561e5e6a9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1999-10-14  Lars Gullik Bjønnes  <larsbj@lyx.org>
+
+       * lib/Makefile.am (install-data-local): forgot a ';'
+       (install-data-local): forgot a '\'
+       (libinstalldirs): needed after all. reintroduced.
+
 1999-10-13  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
        * configure.in (AC_OUTPUT): added lyx.spec

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 3c594ab2bca45aaf103f26f3db80e73dfc51840e..1caddd80b983fd46d6f7ce538fc22bb50402ba62 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -7,7 +7,8 @@ SUBDIRS    = reLyX
 
 BIND = bind/*.bind
 CLIPART = clipart/*.eps
-DOC = doc/LaTeXConfig.lyx.in 
+DOCDIST = doc/LaTeXConfig.lyx*
+DOCINST = doc/*
 EXAMPLES = examples/*.lyx
 IMAGES = images/*.xpm images/*.xbm
 KBD = kbd/*.kmap kbd/*.cdef
@@ -15,23 +16,32 @@ LAYOUT = layouts/*.layout layouts/*.inc
 TEMPL = templates/*.lyx
 TEXSUPPORT = tex/*.cls
 
+LIBINSTFILES = $(BIND) $(CLIPART) $(DOCINST) $(EXAMPLES) $(IMAGES) $(KBD) \
+       $(LAYOUT) $(TEMPL) $(TEXSUPPORT)
+
+LIBDISTFILES = $(BIND) $(CLIPART) $(DOCDIST) $(EXAMPLES) $(IMAGES) $(KBD) \
+       $(LAYOUT) $(TEMPL) $(TEXSUPPORT)
+
 pkgdata_DATA = lyxrc.example CREDITS chkconfig.ltx lyxrc.defaults \
                textclass.lst packages.lst
 
-LIBINSTFILES = $(BIND) $(CLIPART) $(EXAMPLES) $(IMAGES) $(KBD) \
-       $(LAYOUT) $(TEMPL) $(TEXSUPPORT)
+LYXLIBDIRS = bind clipart doc examples images kbd layouts templates tex
 
 EXTRA_DIST = CREDITS chkconfig.ltx configure.cmd lyxrc.example \
-       $(LIBINSTFILES) $(DOC)
+       $(LYXLIBDIRS)
+
+libinstalldirs:
+       for dir in $(LYXLIBDIRS) ; do \
+               $(mkinstalldirs) $(pkgdatadir)/$$dir ; \
+       done
 
-install-data-local:
+install-data-local: libinstalldirs
        files=`cd ${srcdir} ; echo $(LIBINSTFILES)` ; \
        for i in $${files} ; do \
           $(INSTALL_DATA) ${srcdir}/$$i $(pkgdatadir)/$$i ; \
-       done \
-       for i in doc/* ; do
-               $(INSTALL_DATA) ${srcdir}/$$i $(pkgdatadir)/$$i ; \
        done
 
 dist-hook:
-       cd ${distdir} ; cvs -q export -r HEAD -d doc lyxdoc
+       cd ${distdir} ; rm -rf `find . -name \*CVS\*` ; \
+       rm -rf doc/BUGS.lyx ; \
+       cvs -Q export -r HEAD -d doc lyxdoc