Merge tag 'upstream/1.1.1'

[psensor-pkg-ubuntu.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c4e3e53..df37f0f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,16 +23,15 @@ dist_doc_DATA = AUTHORS \
        README \
        README.html
 
        README \
        README.html
 

-autostartdir = $(sysconfdir)/xdg/autostart
-autostart_DATA = psensor.desktop
-

 desktopdir = $(datadir)/applications
 desktop_DATA = psensor.desktop
 
 EXTRA_DIST = $(desktop_DATA) $(autostart_DATA)
 
 desktopdir = $(datadir)/applications
 desktop_DATA = psensor.desktop
 
 EXTRA_DIST = $(desktop_DATA) $(autostart_DATA)
 

+if ASCIIDOC

 README.html: README www/style.css
        asciidoc --theme style -a themedir=`pwd`/www -n -a toc README
 
 NEWS.html: NEWS www/style.css
        asciidoc --theme style -a themedir=`pwd`/www NEWS
 README.html: README www/style.css
        asciidoc --theme style -a themedir=`pwd`/www -n -a toc README
 
 NEWS.html: NEWS www/style.css
        asciidoc --theme style -a themedir=`pwd`/www NEWS

+endif