Browse files

Merge pull request #28 from cluck/2.0-sysconfdir

handle "configure --sysconfdir=LSETCDIR"
  • Loading branch information...
2 parents 5804676 + d157fb7 commit 0060c697e3014eab1f9148f81f5eba14e402b042 @openlava committed Mar 1, 2012
View
3 Makefile.am
@@ -1,6 +1,9 @@
#
# Copyright (C) David Bigagli
#
+
+include $(top_srcdir)/common.mk
+
SUBDIRS = lsf lsbatch lsf/res eauth scripts chkpnt config
MISSING_FILES = aclocal.m4
View
3 chkpnt/Makefile.am
@@ -1,6 +1,9 @@
#
# Copyright (C) openlava foundation
#
+
+include $(top_srcdir)/common.mk
+
INCLUDES = -I../lsf
sbin_PROGRAMS = echkpnt erestart
View
6 common.mk
@@ -0,0 +1,6 @@
+#
+# Copyright (C) 2012 Claudio Luck
+#
+
+AM_CPPFLAGS = -DSYSCONFDIR=\"${sysconfdir}\"
+
View
3 config/Makefile.am
@@ -2,6 +2,9 @@
# Copyright (C) David Bigagli
#
+include $(top_srcdir)/common.mk
+
+
# Install configuration files for openlava base and batch
# in the conf directory.
View
3 eauth/Makefile.am
@@ -1,6 +1,9 @@
#
# Copyright (C) openlava foundation
#
+
+include $(top_srcdir)/common.mk
+
INCLUDES = -I$(top_srcdir)/lsf
sbin_PROGRAMS = eauth
View
2 lsbatch/Makefile.am
@@ -2,6 +2,8 @@
# Copyright (C) 2011 openlava foundation
#
+include $(top_srcdir)/common.mk
+
include_HEADERS = lsbatch.h
SUBDIRS = lib daemons cmd bhist man1 man5 man8
View
3 lsbatch/bhist/Makefile.am
@@ -1,6 +1,9 @@
#
# Copyright (C) openlava foundation
#
+
+include $(top_srcdir)/common.mk
+
INCLUDES = -I$(top_srcdir)/lsf -I$(top_srcdir)/lsf/lib \
-I$(top_srcdir)/lsbatch -I$(top_srcdir)/lsbatch/lib -I./
View
3 lsbatch/cmd/Makefile.am
@@ -1,6 +1,9 @@
#
# Copyright (C) openlava foundation
#
+
+include $(top_srcdir)/common.mk
+
INCLUDES = -I$(top_srcdir)/lsf -I$(top_srcdir)/lsf/lib \
-I$(top_srcdir)/lsbatch -I$(top_srcdir)/lsbatch/lib -I./
View
3 lsbatch/daemons/Makefile.am
@@ -1,6 +1,9 @@
#
# Copyright (C) openlava foundation
#
+
+include $(top_srcdir)/common.mk
+
INCLUDES = -I$(top_srcdir)/lsf -I$(top_srcdir)/lsf/lib \
-I$(top_srcdir)/lsbatch -I$(top_srcdir)/lsbatch/lib -I./
View
3 lsbatch/lib/Makefile.am
@@ -1,6 +1,9 @@
#
# Copyright (C) 2011 openlava foundation
#
+
+include $(top_srcdir)/common.mk
+
INCLUDES = -I$(top_srcdir)/lsf -I$(top_srcdir)/lsf/lib \
-I$(top_srcdir)/lsbatch -I./
View
3 lsbatch/man1/Makefile.am
@@ -1,6 +1,9 @@
#
# Copyright (C) openlava foundation
#
+
+include $(top_srcdir)/common.mk
+
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 \
View
3 lsbatch/man5/Makefile.am
@@ -1,6 +1,9 @@
#
# Copyright (C) openlava foundation
#
+
+include $(top_srcdir)/common.mk
+
man_MANS = lsb.acct.5 lsb.hosts.5 lsb.queues.5 \
lsb.events.5 lsb.params.5 lsb.users.5
View
3 lsbatch/man8/Makefile.am
@@ -1,6 +1,9 @@
#
# Copyright (C) openlava foundation
#
+
+include $(top_srcdir)/common.mk
+
man_MANS = badmin.8 brun.8 mbatchd.8 sbatchd.8
#
EXTRA_DIST = $(man_MANS)
View
2 lsf/Makefile.am
@@ -2,6 +2,8 @@
# Copyright (C) 2011 openlava foundation
#
+include $(top_srcdir)/common.mk
+
include_HEADERS = lsf.h
SUBDIRS = intlib lib lim pim lstools lsadm man
View
2 lsf/intlib/Makefile.am
@@ -2,6 +2,8 @@
# Copyright (C) 2011 openlava foundation
#
+include $(top_srcdir)/common.mk
+
INCLUDES = -I../
noinst_LIBRARIES = liblsfint.a
View
3 lsf/lib/Makefile.am
@@ -1,6 +1,9 @@
#
# Copyright (C) 2011 David Bigagli
#
+
+include $(top_srcdir)/common.mk
+
INCLUDES = -I../
lib_LIBRARIES = liblsf.a
View
5 lsf/lim/Makefile.am
@@ -1,8 +1,11 @@
#
# Copyright (C) openlava foundation
#
+
+include $(top_srcdir)/common.mk
+
INCLUDES = -I$(top_srcdir)/lsf
-AM_CPPFLAGS = -D$(HOSTTYPE) -DHOST_TYPE_STRING=\"$(HOSTTYPE)\"
+AM_CPPFLAGS += -D$(HOSTTYPE) -DHOST_TYPE_STRING=\"$(HOSTTYPE)\"
HOSTTYPE=LINUX64
View
3 lsf/lsadm/Makefile.am
@@ -1,6 +1,9 @@
#
# Copyright (C) openlava foundation
#
+
+include $(top_srcdir)/common.mk
+
INCLUDES = -I$(top_srcdir)/lsf
bin_PROGRAMS = lsadmin
View
2 lsf/lsf.h
@@ -770,7 +770,7 @@ typedef void (*SIGFUNCTYPE)(int);
typedef struct stat LS_STAT_T;
#define LSTMPDIR lsTmpDir_
#define LSDEVNULL "/dev/null"
-#define LSETCDIR "/opt/openlava/etc"
+#define LSETCDIR SYSCONFDIR
#define closesocket close
#define CLOSESOCKET(s) close((s))
#define SOCK_CALL_FAIL(c) ((c) < 0 )
View
3 lsf/lstools/Makefile.am
@@ -1,6 +1,9 @@
#
# Copyright (C) openlava foundation
#
+
+include $(top_srcdir)/common.mk
+
INCLUDES = -I..
bin_PROGRAMS = lsacct lseligible lshosts lsid lsinfo lsloadadj \
View
2 lsf/man/Makefile.am
@@ -2,5 +2,7 @@
# Copyright (C) 2011 openlava foundation
#
+include $(top_srcdir)/common.mk
+
SUBDIRS = man1 man5 man8
View
3 lsf/man/man1/Makefile.am
@@ -1,6 +1,9 @@
#
# Copyright (C) openlava foundation
#
+
+include $(top_srcdir)/common.mk
+
man_MANS = lseligible.1 lsfintro.1 lsid.1 lsload.1 lsmon.1 lsrcp.1 \
lsacct.1 lsfbase.1 lshosts.1 lsinfo.1 lsloadadj.1 lsplace.1
View
3 lsf/man/man5/Makefile.am
@@ -1,6 +1,9 @@
#
# Copyright (C) openlava foundation
#
+
+include $(top_srcdir)/common.mk
+
man_MANS = lsf.acct.5 lsf.conf.5 lim.acct.5 lsf.cluster.5 lsf.shared.5
#
EXTRA_DIST = $(man_MANS)
View
3 lsf/man/man8/Makefile.am
@@ -1,6 +1,9 @@
#
# Copyright (C) openlava foundation
#
+
+include $(top_srcdir)/common.mk
+
man_MANS = eauth.8 esub.8 lsadmin.8 nios.8 res.8 eexec.8 lim.8 lsfinstall.8 pim.8
#
EXTRA_DIST = $(man_MANS)
View
2 lsf/pim/Makefile.am
@@ -2,6 +2,8 @@
# Copyright (C) openlava foundation
#
+include $(top_srcdir)/common.mk
+
INCLUDES = -I$(top_srcdir)/lsf
sbin_PROGRAMS = pim
View
3 lsf/res/Makefile.am
@@ -1,6 +1,9 @@
#
# Copyright (C) openlava foundation
#
+
+include $(top_srcdir)/common.mk
+
INCLUDES = -I$(top_srcdir)/lsf
sbin_PROGRAMS = res nios
View
3 scripts/Makefile.am
@@ -2,6 +2,9 @@
# Copyright (C) openlava foundation
#
+include $(top_srcdir)/common.mk
+
+
# Install scripts implementing integration with
# mpi and openmpi systems.

0 comments on commit 0060c69

Please sign in to comment.