# HG changeset patch
# User Michiel Broek <mbroek@mbse.eu>
# Date 1533901583 -7200
# Node ID 36387e45a194cd816bdabf8fc1bcc95d0c793eae
# Parent  1750b6cae48e9e6e684e744369edbbf5185d63d8
Added Makefile install commands

diff -r 1750b6cae48e -r 36387e45a194 Makefile.global.in
--- a/Makefile.global.in	Thu Aug 09 21:52:01 2018 +0200
+++ b/Makefile.global.in	Fri Aug 10 13:46:23 2018 +0200
@@ -10,7 +10,8 @@
 ETCDIR		= @prefix@/etc
 DOCDIR		= @prefix@/doc
 VARDIR		= @prefix@/var
-DATADIR		= @prefix@/share/@PACKAGE@/
+WWWDIR		= @prefix@/www
+DATADIR		= /usr/share/@PACKAGE@/
 
 INSTALL		= @INSTALL@
 SHELL		= /bin/sh
diff -r 1750b6cae48e -r 36387e45a194 bmsd/Makefile
--- a/bmsd/Makefile	Thu Aug 09 21:52:01 2018 +0200
+++ b/bmsd/Makefile	Fri Aug 10 13:46:23 2018 +0200
@@ -23,7 +23,8 @@
 		rm -f ${TARGET} *.o *.h~ *.c~ core filelist Makefile.bak
 
 install:	all
-		${INSTALL} -c -s -g root -o root -m 0755 bmsd ${BINDIR}
+		${INSTALL} -d -g 314 -o 314 ${PREFIX} ${BINDIR}
+		${INSTALL} -c -s -g 314 -o 314 -m 0755 bmsd ${BINDIR}
 
 filelist:	Makefile
 		BASE=`pwd`; \
diff -r 1750b6cae48e -r 36387e45a194 config.log
--- a/config.log	Thu Aug 09 21:52:01 2018 +0200
+++ b/config.log	Fri Aug 10 13:46:23 2018 +0200
@@ -142,7 +142,7 @@
 | #define PACKAGE_STRING ""
 | #define PACKAGE_BUGREPORT ""
 | #define PACKAGE_URL ""
-| #define VERSION "0.0.2"
+| #define VERSION "0.0.3"
 | #define COPYRIGHT "Copyright (C) 2016-2018 Michiel Broek, All Rights Reserved"
 | /* end confdefs.h.  */
 | #include <ac_nonexistent.h>
@@ -161,7 +161,7 @@
 | #define PACKAGE_STRING ""
 | #define PACKAGE_BUGREPORT ""
 | #define PACKAGE_URL ""
-| #define VERSION "0.0.2"
+| #define VERSION "0.0.3"
 | #define COPYRIGHT "Copyright (C) 2016-2018 Michiel Broek, All Rights Reserved"
 | /* end confdefs.h.  */
 | #include <ac_nonexistent.h>
@@ -296,7 +296,7 @@
 | #define PACKAGE_STRING ""
 | #define PACKAGE_BUGREPORT ""
 | #define PACKAGE_URL ""
-| #define VERSION "0.0.2"
+| #define VERSION "0.0.3"
 | #define COPYRIGHT "Copyright (C) 2016-2018 Michiel Broek, All Rights Reserved"
 | #define STDC_HEADERS 1
 | #define HAVE_SYS_TYPES_H 1
@@ -360,14 +360,13 @@
 config.status:817: creating Makefile.global
 config.status:817: creating www/version.php
 config.status:817: creating config.h
-config.status:987: config.h is unchanged
 configure:5173: result:
 -=-=-=-=-=-=-=-=-=-= Configuration Complete =-=-=-=-=-=-=-=-=-=-
 
   Configuration summary :
 
-    Version : ............ 0.0.2
-    Main directory : ..... /usr/local
+    Version : ............ 0.0.3
+    Main directory : ..... /var/lib/bms
 
 
   Now type 'make' and 'sudo make install'
@@ -462,9 +461,9 @@
 SDL_CFLAGS=''
 SDL_LIBS=''
 SHELL='/bin/sh'
-SUBDIRS='bmsd doc tools'
+SUBDIRS='bmsd doc tools www'
 TAR='tar'
-VERSION='0.0.2'
+VERSION='0.0.3'
 ac_ct_CC='gcc'
 bindir='${exec_prefix}/bin'
 build_alias=''
@@ -484,7 +483,7 @@
 mandir='${datarootdir}/man'
 oldincludedir='/usr/include'
 pdfdir='${docdir}'
-prefix='/usr/local'
+prefix='/var/lib/bms'
 program_transform_name='s,x,x,'
 psdir='${docdir}'
 sbindir='${exec_prefix}/sbin'
@@ -503,7 +502,7 @@
 #define PACKAGE_STRING ""
 #define PACKAGE_BUGREPORT ""
 #define PACKAGE_URL ""
-#define VERSION "0.0.2"
+#define VERSION "0.0.3"
 #define COPYRIGHT "Copyright (C) 2016-2018 Michiel Broek, All Rights Reserved"
 #define STDC_HEADERS 1
 #define HAVE_SYS_TYPES_H 1
diff -r 1750b6cae48e -r 36387e45a194 config.status
--- a/config.status	Thu Aug 09 21:52:01 2018 +0200
+++ b/config.status	Fri Aug 10 13:46:23 2018 +0200
@@ -621,9 +621,9 @@
 S["CC"]="gcc"
 S["CYEARS"]="2016-2018"
 S["COPYRIGHT"]="Copyright (C) 2016-2018 Michiel Broek, All Rights Reserved"
-S["VERSION"]="0.0.2"
+S["VERSION"]="0.0.3"
 S["PACKAGE"]="bms"
-S["SUBDIRS"]="bmsd doc tools"
+S["SUBDIRS"]="bmsd doc tools www"
 S["target_alias"]=""
 S["host_alias"]=""
 S["build_alias"]=""
@@ -652,7 +652,7 @@
 S["sbindir"]="${exec_prefix}/sbin"
 S["bindir"]="${exec_prefix}/bin"
 S["program_transform_name"]="s,x,x,"
-S["prefix"]="/usr/local"
+S["prefix"]="/var/lib/bms"
 S["exec_prefix"]="${prefix}"
 S["PACKAGE_URL"]=""
 S["PACKAGE_BUGREPORT"]=""
@@ -709,7 +709,7 @@
 D["PACKAGE_STRING"]=" \"\""
 D["PACKAGE_BUGREPORT"]=" \"\""
 D["PACKAGE_URL"]=" \"\""
-D["VERSION"]=" \"0.0.2\""
+D["VERSION"]=" \"0.0.3\""
 D["COPYRIGHT"]=" \"Copyright (C) 2016-2018 Michiel Broek, All Rights Reserved\""
 D["STDC_HEADERS"]=" 1"
 D["HAVE_SYS_TYPES_H"]=" 1"
diff -r 1750b6cae48e -r 36387e45a194 configure
--- a/configure	Thu Aug 09 21:52:01 2018 +0200
+++ b/configure	Fri Aug 10 13:46:23 2018 +0200
@@ -583,7 +583,7 @@
 PACKAGE_URL=
 
 ac_unique_file="bmsd/bms.c"
-ac_default_prefix=/usr/local
+ac_default_prefix=/var/lib/bms
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -2027,11 +2027,11 @@
 
 ac_config_headers="$ac_config_headers config.h"
 
-SUBDIRS="bmsd doc tools"
+SUBDIRS="bmsd doc tools www"
 
 
 PACKAGE="bms"
-VERSION="0.0.2"
+VERSION="0.0.3"
 COPYRIGHT="Copyright (C) 2016-2018 Michiel Broek, All Rights Reserved"
 CYEARS="2016-2018"
 
diff -r 1750b6cae48e -r 36387e45a194 configure.ac
--- a/configure.ac	Thu Aug 09 21:52:01 2018 +0200
+++ b/configure.ac	Fri Aug 10 13:46:23 2018 +0200
@@ -2,20 +2,20 @@
 
 AC_INIT(bmsd/bms.c)
 AM_CONFIG_HEADER(config.h)
-SUBDIRS="bmsd doc tools"
+SUBDIRS="bmsd doc tools www"
 AC_SUBST(SUBDIRS)
 
 dnl General settings
 dnl After changeing the version number, run autoconf!
 PACKAGE="bms"
-VERSION="0.0.2"
+VERSION="0.0.3"
 COPYRIGHT="Copyright (C) 2016-2018 Michiel Broek, All Rights Reserved"
 CYEARS="2016-2018"
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
 AC_SUBST(COPYRIGHT)
 AC_SUBST(CYEARS)
-AC_PREFIX_DEFAULT(/usr/local)
+AC_PREFIX_DEFAULT(/var/lib/bms)
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 AC_DEFINE_UNQUOTED(COPYRIGHT, "$COPYRIGHT")
 TARGET="$target"
diff -r 1750b6cae48e -r 36387e45a194 www/Makefile
--- a/www/Makefile	Thu Aug 09 21:52:01 2018 +0200
+++ b/www/Makefile	Fri Aug 10 13:46:23 2018 +0200
@@ -3,8 +3,10 @@
 
 include ../Makefile.global
 
-SRC		= version.php.in index.php getfermenter.php  getfermenters.php  \
-		  getnode.php  getnodes.php config.php.dist
+SRC		= index.php getfermenter.php  getfermenters.php  \
+		  getnode.php  getnodes.php config.php.dist 
+SUB		= version.php.in images/* css/* jqwidgets/* jqwidgets/styles/* \
+		  jqwidgets/styles/images/* jqwidgets/globalization/* js/*
 OTHER		= Makefile
 
 #############################################################################
@@ -18,11 +20,20 @@
 		rm -f version.php
 
 install:
+		${INSTALL} -d -g 314 -o 314 ${PREFIX} ${WWWDIR} ${WWWDIR}/css \
+			${WWWDIR}/jqwidgets ${WWWDIR}/js ${WWWDIR}/images/
+		${INSTALL} -g 314 -o 314 ${SRC} ${WWWDIR}/
+		${INSTALL} -g 314 -o 314 version.php ${WWWDIR}/
+		${INSTALL} -g 314 -o 314 css/* ${WWWDIR}/css/
+		${INSTALL} -g 314 -o 314 images/* ${WWWDIR}/images/
+		cp -r jqwidgets/* ${WWWDIR}/jqwidgets/
+		chown -R 314:314 ${WWWDIR}/jqwidgets
+		${INSTALL} -g 314 -o 314 js/* ${WWWDIR}/js/
 
 filelist:	Makefile
 		BASE=`pwd`; \
 		BASE=`basename $${BASE}`; \
-		(for f in ${SRC} ${OTHER} ;do echo ${PACKAGE}-${VERSION}/$${BASE}/$$f; done) >filelist
+		(for f in ${SRC} ${SUB} ${OTHER} ;do echo ${PACKAGE}-${VERSION}/$${BASE}/$$f; done) >filelist
 
 depend: