Merge branch 'vlp-7' with 'master'

Conflicts:
	Makefile.am

diff --combined Makefile.am
index ea6c776e98bf4cbc003b7d37ff7057e07dd23a82,2a7a542628d5177f300d32f155712768be7cb553..96d0cf998e950a776d6568a56c7ac32d7fed13a2
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -133,12 -133,26 +133,26 @@@ clean-loghelp-extra
        rm -f bin/loghelp
  
  all-local: doxyfile.stamp
+       test -d bin/doc || mkdir bin/doc
+       test -d bin/pics || mkdir bin/pics
        test -d bin/modules || mkdir bin/modules
+       test -d bin/config || mkdir bin/config
+       test -d bin/compile || mkdir bin/compile
+       test -d bin/doc/lang || mkdir bin/doc/lang
+       test -d bin/examp || mkdir bin/examp
        ln -fs ../logedit bin/modules/
        ln -fs ../loggraph bin/modules/
        ln -fs ../loghelp bin/modules/
        ln -fs ../lognet bin/modules/
+       ln -fs ../logint bin/modules/
+       ln -fs ../logcomp bin/compile/
+       ln -fs ../lgconfig bin/config/
+       ln -fs ../../doc/install/inst/loglan bin/compile/
+       ln -fs ../../doc/install/inst/gen bin/compile/
        cp doc/vlp.cfg.sample bin/vlp.cfg
+       cp -r doc/examples/* bin/examp/
+       cp doc/install/inst/close.bmp bin/pics/
+       cp doc/install/inst/logo.bmp bin/config/
  
  clean-am: \
    clean-loggraph-extra \
@@@ -149,7 -163,12 +163,12 @@@
    clean-lgconfig-extra \
    clean-logcomp-extra \
    clean-loghelp-extra
+       rm -rf bin/doc
+       rm -rf bin/pics
        rm -rf bin/modules
+       rm -rf bin/config
+       rm -rf bin/compile
+       rm -rf bin/examp
        rm -f bin/vlp.cfg
  
  CLEANFILES = \
@@@ -158,23 -177,4 +177,23 @@@
        %~ \
        doxyfile.stamp
  
 +if HAVE_DOXYGEN
 +
 +directory = $(top_srcdir)/doc/man/man3/
 +
 +dist_man_MANS = $(directory)/man_page_1.3 $(directory)/man_page_2.3
 +$(directory)/man_page_1.3: doxyfile.stamp
 +$(directory)/man_page_2.3: doxyfile.stamp
 +
 +doxyfile.stamp:
 +      $(DOXYGEN) Doxyfile
 +      echo Timestamp > doxyfile.stamp
 +
 +#all-local: doxyfile.stamp
 +
 +clean-local:
 +      rm -rf $(top_srcdir)/doc/man
 +
 +endif
 +
  dist_noinst_SCRIPTS = autogen.sh