install and distribution fixes

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

ChangeLog

@@ -1,5 +1,15 @@
 1999-10-13  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
+	* po/*.po: merged with lyx.pot becuase of make distcheck
+	
+	* lib/Makefile.am (dist-hook): added dist-hook so that
+	documentation files will be included when doing a make
+	dist/distdir/distcheck. Requires cvs export -r HEAD lyxdoc to run.
+	(pkgdata_SCRIPTS): added configure.cmd for now, we can use som
+	conditional later.
+	more: tried to make install do the right thing, exclude CVS dirs
+	etc.
+
 	* src/LaTeXLog.C (ShowLatexLog): reordered som statements so that
 	Path would fit in more nicely.
 

lib/Makefile.am

@@ -1,37 +1,37 @@
 AUTOMAKE_OPTIONS = foreign
 DISTCLEANFILES = *.orig *.rej *~ *.bak textclass.lst packages.lst \
 		lyxrc.defaults doc/LaTeXConfig.lyx
-pkgdata_SCRIPTS = configure
+pkgdata_SCRIPTS = configure configure.cmd
 MAINTAINERCLEANFILES = Makefile.in
 SUBDIRS    = reLyX
 
-LYXDATADIRS = bind clipart doc examples images kbd layouts templates tex
-EXTRA_DIST = CREDITS chkconfig.ltx configure.cmd lyxrc.example \
-	$(LYXDATADIRS)
-
-CLIPART = clipart/*.eps
-LAYOUT = layouts/*.layout layouts/*.inc 
-DOC = doc/*.lyx doc/LaTeXConfig.lyx.in
-KBD = kbd/*.kmap kbd/*.cdef
-TEMPL = templates/*.lyx
 BIND = bind/*.bind
+CLIPART = clipart/*.eps
+DOC = doc/LaTeXConfig.lyx.in 
 EXAMPLES = examples/*.lyx
-TEXSUPPORT = tex/*.cls
 IMAGES = images/*.xpm images/*.xbm
+KBD = kbd/*.kmap kbd/*.cdef
+LAYOUT = layouts/*.layout layouts/*.inc 
+TEMPL = templates/*.lyx
+TEXSUPPORT = tex/*.cls
 
 pkgdata_DATA = lyxrc.example CREDITS chkconfig.ltx lyxrc.defaults \
                textclass.lst packages.lst
 
-LIBINSTFILES = $(LAYOUT) $(CLIPART) $(DOC) $(KBD) $(DOC) $(TEMPL) $(BIND) \
-               $(EXAMPLES) $(TEXSUPPORT) $(IMAGES)
+LIBINSTFILES = $(BIND) $(CLIPART) $(EXAMPLES) $(IMAGES) $(KBD) \
+	$(LAYOUT) $(TEMPL) $(TEXSUPPORT)
 
-libinstalldirs:
-	for dir in $(LYXDATADIRS) ; do \
-	  $(mkinstalldirs) $(pkgdatadir)/$$dir ; \
-	done
+EXTRA_DIST = CREDITS chkconfig.ltx configure.cmd lyxrc.example \
+	$(LIBINSTFILES) $(DOC)
 
-install-data-local:  libinstalldirs
+install-data-local:
 	files=`cd ${srcdir} ; echo $(LIBINSTFILES)` ; \
 	for i in $${files} ; do \
 	   $(INSTALL_DATA) ${srcdir}/$$i $(pkgdatadir)/$$i ; \
-	done 
+	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