Index: binsrc/vsp/Makefile.am
===================================================================
--- binsrc/vsp/Makefile.am
+++ binsrc/vsp/Makefile.am	2010-02-15 14:46:32.000000000 +0100
@@ -24,6 +24,7 @@
 #dist_httproot_DATA = *.html *.css *.txt
 
 install-data-local:
+if WITH_DEMO_VAD
 	@echo Installing in "$(httprootdir)" 
 	mkdir -p "$(DESTDIR)$(httprootdir)"
 	mkdir -p "$(DESTDIR)$(httprootdir)"/images
@@ -37,7 +38,7 @@
 	$(INSTALL_DATA) images/*.png "$(DESTDIR)$(httprootdir)"/images
 	$(INSTALL_DATA) images/*.jpg "$(DESTDIR)$(httprootdir)"/images
 	$(INSTALL_DATA) vsmx/*.* "$(DESTDIR)$(httprootdir)"/vsmx
-
+endif
 
 uninstall-local:
 	rm -rf "$(DESTDIR)$(httprootdir)"/*
Index: binsrc/samples/demo/Makefile.am
===================================================================
--- binsrc/samples/demo/Makefile.am
+++ binsrc/samples/demo/Makefile.am	2010-02-15 14:45:24.000000000 +0100
@@ -164,6 +164,8 @@
 	chmod +x install_ini.sh
 	mkdir -p "$(DESTDIR)$(dbdir)"
 	$(SHELL) install_ini.sh database
+
+if WITH_DEMO_VAD
 if WITH_HTMLDOC
 	mkdir -p "$(DESTDIR)$(htmldocdir)"
 	$(INSTALL_DATA) $(top_srcdir)/docsrc/html_virt/*.html "$(DESTDIR)$(htmldocdir)"
@@ -173,6 +175,7 @@
 	(cd $(top_srcdir)/docsrc/images; find . -name \*.png -print | cpio -dump "$(DESTDIR)$(htmldocdir)/../images")
 	(cd $(top_srcdir)/docsrc/images; find . -name \*.ico -print | cpio -dump "$(DESTDIR)$(htmldocdir)/../images")
 endif
+endif
 
 uninstall-local:
 	rm -f "$(DESTDIR)$(dbdir)/virtuoso.ini"