From e4f77cb985b99977da7dde0f1302b492fe2de7d0 Mon Sep 17 00:00:00 2001
From: epoupon <itmfr@yahoo.fr>
Date: Tue, 22 Sep 2015 12:53:53 +0200
Subject: [PATCH] Updated install

---
 Makefile.am | 17 +++++++++++++++++
 README.md   | 44 ++++++++++++++------------------------------
 2 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 588149ae..f886e62f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,3 +3,20 @@ AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
 
 SUBDIRS = test src
 
+lms_docrootdir=$(pkgdatadir)/docroot
+lms_approotdir=$(pkgdatadir)/approot
+
+lms_cssdir=$(lms_docrootdir)/css
+lms_imagesdir=$(lms_docrootdir)/images
+
+lms_css_DATA = \
+		 docroot/css/lms.css
+
+lms_images_DATA = \
+		 docroot/images/unknown-cover.jpg
+
+lms_approot_DATA = \
+		approot/templates.xml
+
+install-data-local:
+	ln -s $(datadir)/Wt/resources $(lms_docrootdir)/resources
diff --git a/README.md b/README.md
index f7289912..6c029ea3 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,6 @@ It allows you to access your music and your videos using an https web interface.
  - Winamp-like interface, suited for large databases
  - Audio/Video transcode for maximum interoperability and low bandwith requirements
  - User management
- - LMS API available in Protocol Buffers (see src/lms-api/proto/messages.proto)
 
 Please note LMS is still under development and will gain more features in the future.
 
@@ -20,60 +19,46 @@ Please note some media files may require significant CPU usage to be transcoded.
 $ apt-get install g++ autoconf automake libboost-dev libboost-locale-dev libboost-iostreams-dev libboost-log-dev libavcodec-dev libwtdbosqlite-dev libwthttp-dev libwtdbo-dev libwt-dev libmagick++-dev libavcodec-dev libavformat-dev libavutil
 ```
 
-If you want to enable the LMS API, you need these additional packages:
-
-```sh
-$ apt-get install libprotobuf-dev libprotobuf-dev protobuf-compiler
-```
-
-Warning: your distrib may provide an outdated wt library. Using the latest Wt (>= 3.3.3) is highly recommended (see http://www.webtoolkit.eu/wt)
-
 ## Build
 
 ```sh
 $ autoreconf -vfi
 $ mkdir build
 $ cd build
-$ ../configure
+$ ../configure --prefix=/usr
 ```
-
 configure will complain if a mandatory library is missing.
 
-The configure script allows you to disable the LMS API support, see 'configure --help' for more information.
 ```sh
-$ make
+$ make -j 4
 ```
 
-## Setting up SSL materials
-This is required by the SSL server and the web server.
+## Install
+```sh
+$ make install
+```
+This command requires root privileges
+## Running
 
+```sh
+$ /usr/bin/lms --docroot='/usr/share/lms/docroot/;/resources,/css,/images' --approot=/usr/share/lms/approot --http-address 0.0.0.0 --http-port 5081
+```
+The exectuable needs write accesses to the /var/lms/ directory
+## Setting up SSL materials (optional)
 Here is just a self signed certificate example, you could do use a CA if you want.
 
 Generate a dh file:
 ```sh
 $ openssl dhparam -out dh2048.pem 2048
 ```
-
 Generate a self signed certificate:
 ```sh
 $ openssl req -x509 -out cert.pem -keyout privkey.pem -newkey rsa:4096
 ```
 
-## Running
-
-In the build directory:
 ```sh
-$ ./src/lms lms.conf
+$ /usr/bin/lms --docroot='/usr/share/lms/docroot/;/resources,/css,/images' --approot=/usr/share/lms/approot --https-address 0.0.0.0 --https-port 5081 --ssl-certificate cert.pem --ssl-private-key privkey.pem --ssl-tmp-dh dh2048.pem
 ```
-
-Create the lms.conf file using the etc/lms.sample.conf
- - "ui.resources.approot" has to refer to the ui/approot/ directory.
- - "ui.resources.docroot" has to refer to the ui/docroot/ directory
-You must also link Wt's docroot (usually located in /usr/share/Wt) into that directory. Example:
-```sh
-ln -s /var/lms/docroot/resources /usr/share/Wt/resources
-```
-
 Depending on your SSL parameters, you may be asked for the PEM passphrase to unlock the private key.
 
 ## Credits
@@ -81,5 +66,4 @@ Depending on your SSL parameters, you may be asked for the PEM passphrase to unl
 - Wt (http://www.webtoolkit.eu/)
 - bootstrap3 (http://getbootstrap.com/)
 - libav project (https://www.libav.org/).
-- Protocol Buffers (https://github.com/google/protobuf/)
                                                                                                                                                                        73,1          Bot