Don't install liblsfint.a there is no need to distribute it.

Create daemon log directory under prefix.

Author: David Bigagli

Diff for: .gitattributes

@@ -0,0 +1,4 @@
+.gitattributes export-ignore
+.gitignore export-ignore
+rpms.sh export-ignore
+spec/* export-ignore

Diff for: ChangeLog

@@ -1,3 +1,7 @@
+2011-09-09  David Bigagli  <[email protected]>
+
+	* openlava.spec Updated the spec file to reflect the changes in teh build system. The ownership of all files changed, no longer root, the entire installation tree is owned by the openlava user. The daemons to run in multi user mode must still be started at root which is guaranteed at boot by init.
+
 2011-08-27  David Bigagli  <[email protected]>
 
 	* openlavaconfig.h Removed it from the top directory and merge its content into lsf.h which is the openlava master header file. In this way the repository is more GNU like as well.

Diff for: Makefile.am

@@ -1,7 +1,7 @@
 #
 # Copyright (C) openlava foundation 
 #
-SUBDIRS = lsf config lsbatch lsf/res eauth scripts
+SUBDIRS = lsf config lsbatch lsf/res eauth scripts chkpnt
 
 MISSING_FILES = aclocal.m4
 

Diff for: chkpnt/Makefile

@@ -0,0 +1,12 @@
+#
+# Copyright (C) openlava foundation
+#
+INCLUDES = -I../lsf
+
+sbin_PROGRAMS = echkpnt erestart
+
+echkpnt_SOURCES = echkpnt.c echkpnt.env.c echkpnt.lib.c echkpnt.lib.h echkpnt.env.h
+echkpnt_LDADD = ../lsf/lib/liblsf.a
+
+erestart_SOURCES = erestart.c echkpnt.env.c echkpnt.lib.c echkpnt.lib.h echkpnt.env.h
+erestart_LDADD = ../lsf/lib/liblsf.a

Diff for: chkpnt/Makefile.am

@@ -24,6 +24,7 @@ etc_DATA = openlava openlava.sh openlava.csh \
 # kept.
 install-data-local:
 	mkdir -p $(prefix)/work/logdir
+	mkdir -p $(prefix)/log
 
 # Tell automake to install during distcheck the
 # configuration and etc files. 

Diff for: config/Makefile.am

@@ -46,7 +46,7 @@ case "$opcode" in
         ;;
 
   'start')
-        LSF_CONF=$OPENLAVA_TOP/conf/lsf.conf
+        LSF_CONF=$OPENLAVA_TOP/etc/lsf.conf
 
         if [ -f $LSF_CONF ]
         then

Diff for: config/lsf.conf

@@ -17,6 +17,7 @@ AC_PROG_INSTALL
 AC_PROG_RANLIB
 AC_PROG_YACC
 AC_PROG_LEX
+AC_PROG_LN_S
 AC_PROG_MAKE_SET
 
 # Force warnings on for gcc
@@ -60,7 +61,8 @@ AC_CONFIG_FILES([
 	lsbatch/man5/Makefile    \
 	lsbatch/man8/Makefile    \
 	eauth/Makefile           \
-	scripts/Makefile]
+	scripts/Makefile         \
+	chkpnt/Makefile]
 )
 
 AC_OUTPUT

Diff for: config/openlava

@@ -1113,10 +1113,8 @@ logfile_check(struct bhistReq *Req)
     int lineNum = 0, pos = 0;
     LS_STAT_T statBuf;
     struct eventRec *log;
-
     static char *envdir;
     static char *clusterName;
-
     char ch, *sp;
     struct eventLogFile eLogFile;
     struct eventLogHandle eLogHandle;
@@ -1129,16 +1127,14 @@ logfile_check(struct bhistReq *Req)
         exit(-1);
     }
 
-
     if (!(Req->options & OPT_ELOGFILE)) {
         if ((clusterName = ls_getclustername()) == NULL ) {
             ls_perror("ls_getclustername()");
             exit(-1);
         }
 
-        sprintf(workDir, "%s/%s/logdir", bhistParams[LSB_SHAREDIR].paramValue,
-                clusterName);
-
+        sprintf(workDir, "\
+%s/logdir", bhistParams[LSB_SHAREDIR].paramValue);
 
         readFromHeadFlag = 1;
         readEventFromHead(workDir, Req);
@@ -1175,9 +1171,10 @@ logfile_check(struct bhistReq *Req)
 
         maxEventFile = 0;
         do {
-            sprintf(eventFileName, "%s/%s/logdir/lsb.events.%d",
+            sprintf(eventFileName, "\
+%s/logdir/lsb.events.%d",
                     bhistParams[LSB_SHAREDIR].paramValue,
-                    clusterName, ++maxEventFile);
+                    ++maxEventFile);
         } while (stat(eventFileName, &statBuf) == 0);
 
 	if (Req->numLogFile >= maxEventFile) {

Diff for: configure.ac

@@ -122,6 +122,12 @@ bswitch_LDADD =  \
 	../../lsf/lib/liblsf.a \
 	../../lsf/intlib/liblsfint.a -lnsl -lm
 
+install-data-local:
+	cd "$(DESTDIR)$(bindir)" && ln -sf bkill bstop
+	cd "$(DESTDIR)$(bindir)" && ln -sf bkill bresume
+	cd "$(DESTDIR)$(bindir)" && ln -sf bkill bchkpnt
+	cd "$(DESTDIR)$(bindir)" && ln -sf bmgroup bugroup
+
 etags :
 	etags *.[hc] ../*.h ../lib/*.[hc] ../../lsf/*.h ../../lib/*.[hc] \
 	../../intlib/*.[hc]

Diff for: lsbatch/bhist/bhist.c

@@ -4,6 +4,6 @@
 man_MANS = bbot.1 bkill.1 bparams.1 brestart.1 bswitch.1 lsfbatch.1 \
 	bchkpnt.1 bmgroup.1 bpeek.1 bresume.1 btop.1 \
 	bhosts.1 bmig.1 bqueues.1 bstop.1 bugroup.1 \
-	bjobs.1 bmod.1 brequeue.1 bsub.1 busers.1
+	bjobs.1 bmod.1 brequeue.1 bsub.1 busers.1 
 #
 EXTRA_DIST = $(man_MANS)

Diff for: lsbatch/cmd/Makefile.am

@@ -4,7 +4,7 @@
 
 INCLUDES = -I../
 
-lib_LIBRARIES = liblsfint.a
+noinst_LIBRARIES = liblsfint.a
 
 liblsfint_a_SOURCES = admin.c cmdtime.c jidx.c lsftcl.c resreq.c timers.c wait.c \
            bitset.c conf.c list.c misc.c userok.c window.c \