From 500acbe3bb29cdf1b1c229b9cfab577f79fb82c7 Mon Sep 17 00:00:00 2001
From: Alejandro Mery <amery@opensde.org>
Date: Wed, 13 Jun 2007 16:57:25 +0000
Subject: [PATCH] Changed lvm2 to not suffix with .static when doing an static
 build, and to install symlinks on static case too

---
 base/lvm2/no_dynamic.diff | 46 ++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/base/lvm2/no_dynamic.diff b/base/lvm2/no_dynamic.diff
index 075cff154..1d8651e2b 100644
--- a/base/lvm2/no_dynamic.diff
+++ b/base/lvm2/no_dynamic.diff
@@ -1,7 +1,8 @@
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # 
-# T2 SDE: package/.../lvm2/no_dynamic.diff
+# Filename: package/.../lvm2/no_dynamic.diff
+# Copyright (C) 2007 The OpenSDE Project
 # Copyright (C) 2006 The T2 SDE Project
 # 
 # More information can be found in the files COPYING and README.
@@ -12,7 +13,7 @@
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
-# --- T2-COPYRIGHT-NOTE-END ---
+# --- SDE-COPYRIGHT-NOTE-END ---
 
 --- ./make.tmpl.in.orig	2006-07-07 19:57:41.000000000 +0000
 +++ ./make.tmpl.in	2006-07-07 19:58:24.000000000 +0000
@@ -25,9 +26,9 @@
  
  all: $(SUBDIRS) $(TARGETS)
  
---- ./tools/Makefile.in.orig	2006-04-19 15:33:06.000000000 +0000
-+++ ./tools/Makefile.in	2006-07-07 21:25:45.000000000 +0000
-@@ -66,11 +66,10 @@
+--- ./tools/Makefile.in.orig	2007-03-30 17:00:26.000000000 -0400
++++ ./tools/Makefile.in	2007-05-17 19:56:45.000000000 -0400
+@@ -67,11 +67,10 @@
  	vgsplit.c
  
  TARGETS =\
@@ -42,8 +43,8 @@
  
  ifeq ("@STATIC_LINK@", "yes")
    TARGETS += lvm.static
-@@ -83,7 +82,7 @@
- CLEAN_TARGETS = liblvm2cmd.so liblvm2cmd.a lvm lvm.static lvm.cflow lvm.xref lvm.tree lvm.rxref lvm.rtree
+@@ -87,7 +86,7 @@
+ 		lvmcmdlib.o lvm-static.o
  
  ifeq ("@CMDLIB@", "yes")
 -	TARGETS += liblvm2cmd.so
@@ -51,21 +52,22 @@
  	INSTALL_TARGETS += $(INSTALL_CMDLIB_TARGETS)
  endif
  
-@@ -144,7 +143,7 @@
- 		$(includedir)/lvm2cmd.h
- 
- install_cmdlib_static: liblvm2cmd.a
--	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd.a \
-+	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 liblvm2cmd.a \
- 		$(libdir)/liblvm2cmd.a.$(LIB_VERSION)
- 	$(LN_S) -f liblvm2cmd.a.$(LIB_VERSION) $(libdir)/liblvm2cmd.a
- 	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm2cmd.h \
-@@ -162,7 +161,7 @@
+@@ -168,9 +167,16 @@
+ 		done; \
  	)
  
- install_tools_static: lvm.static
--	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm.static \
-+	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 lvm.static \
- 		$(staticdir)/lvm.static
+-install_tools_static: lvm.static
++install_tools_static: lvm.static .commands
+ 	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm.static \
+-		$(staticdir)/lvm.static
++		$(staticdir)/lvm
++	@echo Creating symbolic links for individual commands in $(sbindir)
++	@( \
++		for v in `cat .commands`; do \
++			cd $(sbindir); \
++			$(LN_S) -f lvm $$v; \
++		done; \
++	)
  
  install: $(INSTALL_TARGETS)
+