[Ocfs-tools-commits] manish commits r209 - in trunk: load_ocfs ocfs_uid_gen

[svn-commits at oss.oracle.com]

Author: manish
Date: 2004-08-30 21:09:46 -0500 (Mon, 30 Aug 2004)
New Revision: 209

Modified:
   trunk/load_ocfs/Makefile
   trunk/ocfs_uid_gen/Makefile
Log:
Hooks for ocfs2-tools


Modified: trunk/load_ocfs/Makefile
===================================================================
--- trunk/load_ocfs/Makefile	2004-08-30 22:50:44 UTC (rev 208)
+++ trunk/load_ocfs/Makefile	2004-08-31 02:09:46 UTC (rev 209)
@@ -2,22 +2,18 @@
 
 include $(TOPDIR)/Preamble.make
 
+ifeq ($(OCFS2_TOOLS),)
 SBIN_EXTRA = load_ocfs
 
 MANS = load_ocfs.8 ocfs.conf.5
+else
+INSTALL_RULES = install-ocfs2
 
-INSTALL_RULES = install-sbin-links install-man-links
+install-ocfs2:
+	$(SHELL) $(TOPDIR)/mkinstalldirs $(DESTDIR)$(sbindir)
+	$(INSTALL_PROGRAM) load_ocfs $(DESTDIR)$(sbindir)/load_ocfs2
+endif
 
-install-sbin-links: install-sbin-extra
-	cd $(DESTDIR)$(sbindir) \
-	&& rm -f load_ocfs2 \
-	&& $(LN_S) load_ocfs load_ocfs2
-
-install-man-links: install-mans
-	cd $(DESTDIR)$(mandir)/man8 \
-	&& rm -f load_ocfs2.8 \
-        && $(LN_S) load_ocfs.8 load_ocfs2.8
-
 DIST_FILES = load_ocfs.8.in ocfs.conf.5.in
 
 include $(TOPDIR)/Postamble.make

Modified: trunk/ocfs_uid_gen/Makefile
===================================================================
--- trunk/ocfs_uid_gen/Makefile	2004-08-30 22:50:44 UTC (rev 208)
+++ trunk/ocfs_uid_gen/Makefile	2004-08-31 02:09:46 UTC (rev 209)
@@ -2,10 +2,18 @@
 
 include $(TOPDIR)/Preamble.make
 
+ifeq ($(OCFS2_TOOLS),)
 SBIN_EXTRA = ocfs_uid_gen
 
 MANS = ocfs_uid_gen.8
+else
+INSTALL_RULES = install-ocfs2
 
+install-ocfs2:
+	$(SHELL) $(TOPDIR)/mkinstalldirs $(DESTDIR)$(sbindir)
+	$(INSTALL_PROGRAM) ocfs_uid_gen $(DESTDIR)$(sbindir)/ocfs_uid_gen2
+endif
+
 DIST_FILES = ocfs_uid_gen ocfs_uid_gen.8.in
 
 include $(TOPDIR)/Postamble.make