[Ocfs2-tools-commits] manish commits r842 - in trunk: . debugfs.ocfs2 fsck.ocfs2 mkfs.ocfs2 mount.ocfs2 mounted.ocfs2 o2cb_ctl ocfs2_hb_ctl ocfs2cdsl tunefs.ocfs2 vendor/common

Tue Apr 26 00:53:45 CDT 2005

Author: manish
Date: 2005-04-26 00:53:43 -0500 (Tue, 26 Apr 2005)
New Revision: 842

Modified:
   trunk/Config.make.in
   trunk/configure.in
   trunk/debugfs.ocfs2/Makefile
   trunk/fsck.ocfs2/Makefile
   trunk/mkfs.ocfs2/Makefile
   trunk/mount.ocfs2/Makefile
   trunk/mounted.ocfs2/Makefile
   trunk/o2cb_ctl/Makefile
   trunk/ocfs2_hb_ctl/Makefile
   trunk/ocfs2cdsl/Makefile
   trunk/tunefs.ocfs2/Makefile
   trunk/vendor/common/ocfs2-tools.spec.in
Log:
Introduce the concept of root-prefix, and land everything but ocfs2console
into /sbin by default


Modified: trunk/Config.make.in
===================================================================

--- trunk/Config.make.in	2005-04-26 05:53:07 UTC (rev 841)
+++ trunk/Config.make.in	2005-04-26 05:53:43 UTC (rev 842)
@@ -19,6 +19,12 @@
 datadir = @datadir@
 sysconfdir = @sysconfdir@
 mandir = @mandir@
+
+root_prefix = @root_prefix@
+root_bindir = @root_bindir@
+root_sbindir = @root_sbindir@
+root_sysconfdir = @root_sysconfdir@
+
 pyexecdir = @pyexecdir@
 
 top_builddir = .

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2005-04-26 05:53:07 UTC (rev 841)
+++ trunk/configure.in	2005-04-26 05:53:43 UTC (rev 842)
@@ -53,6 +53,17 @@
   AC_MSG_ERROR(GCC is required)
 fi
 
+AC_ARG_WITH([root-prefix], [  --with-root-prefix=PREFIX override prefix variable for files to be placed in the root], root_prefix=$withval, root_prefix="")
+
+root_bindir='${root_prefix}/bin'
+root_sbindir='${root_prefix}/sbin'
+root_sysconfdir='${root_prefix}/etc'
+
+AC_SUBST(root_prefix)
+AC_SUBST(root_bindir)
+AC_SUBST(root_sbindir)
+AC_SUBST(root_sysconfdir)
+
 AC_MSG_CHECKING(for debugging)
 AC_ARG_ENABLE(debug, [  --enable-debug=[yes/no]         Turn on debugging [default=yes]],,enable_debug=yes)
 OCFS_DEBUG=

Modified: trunk/debugfs.ocfs2/Makefile
===================================================================
--- trunk/debugfs.ocfs2/Makefile	2005-04-26 05:53:07 UTC (rev 841)
+++ trunk/debugfs.ocfs2/Makefile	2005-04-26 05:53:43 UTC (rev 842)
@@ -2,6 +2,7 @@
 
 include $(TOPDIR)/Preamble.make
 
+sbindir = $(root_sbindir)
 SBIN_PROGRAMS = debugfs.ocfs2
 
 DEFINES = -DG_DISABLE_DEPRECATED -DLINUX -DDEBUGOCFS -DDEBUG

Modified: trunk/fsck.ocfs2/Makefile
===================================================================
--- trunk/fsck.ocfs2/Makefile	2005-04-26 05:53:07 UTC (rev 841)
+++ trunk/fsck.ocfs2/Makefile	2005-04-26 05:53:43 UTC (rev 842)
@@ -2,6 +2,7 @@
 
 include $(TOPDIR)/Preamble.make
 
+sbindir = $(root_sbindir)
 SBIN_PROGRAMS = fsck.ocfs2
 
 INCLUDES = -Iinclude -I$(TOPDIR)/libocfs2/include \

Modified: trunk/mkfs.ocfs2/Makefile
===================================================================
--- trunk/mkfs.ocfs2/Makefile	2005-04-26 05:53:07 UTC (rev 841)
+++ trunk/mkfs.ocfs2/Makefile	2005-04-26 05:53:43 UTC (rev 842)
@@ -13,6 +13,7 @@
 
 CFLAGS = $(OPTS) $(WARNINGS) 
 
+sbindir = $(root_sbindir)
 SBIN_PROGRAMS = mkfs.ocfs2
 
 LIBOCFS2_CFLAGS = -I$(TOPDIR)/libocfs2/include

Modified: trunk/mount.ocfs2/Makefile
===================================================================
--- trunk/mount.ocfs2/Makefile	2005-04-26 05:53:07 UTC (rev 841)
+++ trunk/mount.ocfs2/Makefile	2005-04-26 05:53:43 UTC (rev 842)
@@ -2,6 +2,7 @@
 
 include $(TOPDIR)/Preamble.make
 
+sbindir = $(root_sbindir)
 SBIN_PROGRAMS = mount.ocfs2
 
 INCLUDES = -Iinclude -I$(TOPDIR)/libocfs2/include \

Modified: trunk/mounted.ocfs2/Makefile
===================================================================
--- trunk/mounted.ocfs2/Makefile	2005-04-26 05:53:07 UTC (rev 841)
+++ trunk/mounted.ocfs2/Makefile	2005-04-26 05:53:43 UTC (rev 842)
@@ -23,6 +23,7 @@
 LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb
 LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
 
+sbindir = $(root_sbindir)
 SBIN_PROGRAMS = mounted.ocfs2
 
 INCLUDES = -I$(TOPDIR)/libocfs2/include -I$(TOPDIR)/libo2dlm/include \

Modified: trunk/o2cb_ctl/Makefile
===================================================================
--- trunk/o2cb_ctl/Makefile	2005-04-26 05:53:07 UTC (rev 841)
+++ trunk/o2cb_ctl/Makefile	2005-04-26 05:53:43 UTC (rev 842)
@@ -2,6 +2,7 @@
 
 include $(TOPDIR)/Preamble.make
 
+sbindir = $(root_sbindir)
 SBIN_PROGRAMS = o2cb_ctl
 
 INCLUDES = -Iinclude -I$(TOPDIR)/libocfs2/include \

Modified: trunk/ocfs2_hb_ctl/Makefile
===================================================================
--- trunk/ocfs2_hb_ctl/Makefile	2005-04-26 05:53:07 UTC (rev 841)
+++ trunk/ocfs2_hb_ctl/Makefile	2005-04-26 05:53:43 UTC (rev 842)
@@ -2,6 +2,7 @@
 
 include $(TOPDIR)/Preamble.make
 
+sbindir = $(root_sbindir)
 SBIN_PROGRAMS = ocfs2_hb_ctl
 
 INCLUDES = -Iinclude -I$(TOPDIR)/libocfs2/include \

Modified: trunk/ocfs2cdsl/Makefile
===================================================================
--- trunk/ocfs2cdsl/Makefile	2005-04-26 05:53:07 UTC (rev 841)
+++ trunk/ocfs2cdsl/Makefile	2005-04-26 05:53:43 UTC (rev 842)
@@ -22,6 +22,7 @@
 
 CFLAGS = $(OPTS) $(WARNINGS) 
 
+sbindir = $(root_sbindir)
 SBIN_PROGRAMS = ocfs2cdsl
 
 DEFINES = -DVERSION=\"$(VERSION)\"

Modified: trunk/tunefs.ocfs2/Makefile
===================================================================
--- trunk/tunefs.ocfs2/Makefile	2005-04-26 05:53:07 UTC (rev 841)
+++ trunk/tunefs.ocfs2/Makefile	2005-04-26 05:53:43 UTC (rev 842)
@@ -22,6 +22,7 @@
 LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb
 LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
 
+sbindir = $(root_sbindir)
 SBIN_PROGRAMS = tunefs.ocfs2
 
 INCLUDES = -I$(TOPDIR)/libocfs2/include -I$(TOPDIR)/libo2dlm/include -I$(TOPDIR)/libo2cb/include 

Modified: trunk/vendor/common/ocfs2-tools.spec.in
===================================================================
--- trunk/vendor/common/ocfs2-tools.spec.in	2005-04-26 05:53:07 UTC (rev 841)
+++ trunk/vendor/common/ocfs2-tools.spec.in	2005-04-26 05:53:43 UTC (rev 842)
@@ -57,16 +57,8 @@
 mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
 cp -f vendor/common/o2cb.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/o2cb
 
-for tool in fsck.ocfs2 mkfs.ocfs2 mounted.ocfs2 tunefs.ocfs2 debugfs.ocfs2 o2cb_ctl ocfs2_hb_ctl mount.ocfs2 ocfs2cdsl
-do
-  cd $tool; make DESTDIR="$RPM_BUILD_ROOT" sbindir=/sbin install; cd ..
-done
+make DESTDIR="$RPM_BUILD_ROOT" install
 
-for tool in ocfs2console
-do
-  cd $tool; make DESTDIR="$RPM_BUILD_ROOT" install; cd ..
-done
-
 %{__python} "%{_libdir}/python%{pyversion}/compileall.py" -q "$RPM_BUILD_ROOT/%{_libdir}/python%{pyversion}/site-packages/ocfs2interface"
 
 

