[Cluster-devel] cluster/fence configure agents/scsi/Makefile m ...
cfeist at sourceware.org
cfeist at sourceware.org
Thu Oct 12 16:29:39 UTC 2006
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: cfeist at sourceware.org 2006-10-12 16:29:34
Modified files:
fence : configure
fence/agents/scsi: Makefile
fence/make : defines.mk.input
Log message:
Added changes to support installing init scripts w/ brew build.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/configure.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/scsi/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/make/defines.mk.input.diff?cvsroot=cluster&r1=1.4&r2=1.5
--- cluster/fence/configure 2006/10/05 18:48:58 1.7
+++ cluster/fence/configure 2006/10/12 16:29:34 1.8
@@ -33,6 +33,7 @@
mandir => \$mandir,
prefix => \$prefix,
sbindir => \$sbindir,
+ initdir => \$initdir,
enable_xen => \$enable_xen,
verbose => \$verbose
);
@@ -48,6 +49,7 @@
'mandir=s',
'prefix=s',
'sbindir=s',
+ 'initdir=s',
'sharedir=s',
'enable_xen',
'verbose');
@@ -73,6 +75,7 @@
print "--mandir=\tthe base directory for man pages. (Default: /usr/share/man)\n";
print "--prefix=\tthe base directory to install into. (Default: /)\n";
print "--sbindir=\tthe base directory for system binaries. (Default: /sbin)\n";
+ print "--initdir=\tthe base directory for init scripts. (Default: /etc/init.d)\n";
print "--sharedir=\tthe base directory for misc cluster files. (Default: /usr/share/cluster)\n";
print "--enable_xen\t\tEnable building of Xen-specific pieces\n";
print "--verbose\t\tVerbose output\n";
@@ -105,6 +108,9 @@
if (!$sbindir) {
$sbindir="${prefix}/sbin";
}
+if (!$initdir) {
+ $initdir="${prefix}/etc/init.d";
+}
if (!$sharedir) {
$sharedir="${prefix}/usr/share/cluster";
}
@@ -129,6 +135,7 @@
$_ =~ s/\@CCSLIBDIR\@/$ccslibdir/;
$_ =~ s/\@MANDIR\@/$mandir/;
$_ =~ s/\@SBINDIR\@/$sbindir/;
+ $_ =~ s/\@INITDIR\@/$initdir/;
$_ =~ s/\@SHAREDIR\@/$sharedir/;
$_ =~ s/\@ENABLE_XEN\@/$enable_xen/;
print OFILE "$_\n";
--- cluster/fence/agents/scsi/Makefile 2006/10/12 15:57:06 1.4
+++ cluster/fence/agents/scsi/Makefile 2006/10/12 16:29:34 1.5
@@ -34,7 +34,7 @@
install -d ${sbindir}; \
fi
install -m755 ${TARGET} ${sbindir}
- install -m755 ${SCRIPT} /etc/init.d/
+ install -m755 ${SCRIPT} ${initdir}
clean:
rm -f $(TARGET) $(SCRIPT)
--- cluster/fence/make/defines.mk.input 2006/10/05 18:48:58 1.4
+++ cluster/fence/make/defines.mk.input 2006/10/12 16:29:34 1.5
@@ -20,6 +20,7 @@
cmanincdir ?= ${DESTDIR}@CMANINCDIR@
ccsincdir ?= ${DESTDIR}@CCSINCDIR@
enable_xen ?= @ENABLE_XEN@
+initdir ?= ${DESTDIR}/@INITDIR@
# Where's the kernel?
KERNEL_SRC = @KERNEL_SRC@
More information about the Cluster-devel
mailing list