0b15456
From b2f1bf78400c686bbdbcf4c29fbbb93367abe409 Mon Sep 17 00:00:00 2001
0b15456
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
0b15456
Date: Wed, 25 Mar 2009 09:36:08 +0100
0b15456
Subject: [PATCH] fix location of the library
0b15456
0b15456
---
0b15456
 Makefile |    7 +++----
0b15456
 1 files changed, 3 insertions(+), 4 deletions(-)
0b15456
0b15456
diff --git a/Makefile b/Makefile
0b15456
index 669b6c6..d395fa8 100644
0b15456
--- a/Makefile
0b15456
+++ b/Makefile
0b15456
@@ -20,7 +20,8 @@ INSTALL=install
0b15456
 VERSION=2.0.4
0b15456
 
0b15456
 # the path to the .so
0b15456
-SRC_VIPA_PATH=$(INSTROOT)/usr/lib
0b15456
+LIBDIR=/usr/lib
0b15456
+SRC_VIPA_PATH=$(INSTROOT)$(LIBDIR)
0b15456
 # the path to the starter script
0b15456
 SRC_VIPA_STARTER_PATH=$(INSTROOT)/usr/sbin
0b15456
 # path to man page
0b15456
@@ -34,8 +35,7 @@ src_vipa.so: src_vipa.c
0b15456
 
0b15456
 src_vipa.sh:
0b15456
 	echo '#!/bin/bash' > src_vipa.sh
0b15456
-	echo 'export LD_LIBRARY_PATH=$(SRC_VIPA_PATH):$$LD_LIBRARY_PATH' >> src_vipa.sh
0b15456
-	echo 'export LD_PRELOAD=$(SRC_VIPA_PATH)/src_vipa.so' >> src_vipa.sh
0b15456
+	echo 'export LD_PRELOAD=$(LIBDIR)/src_vipa.so' >> src_vipa.sh
0b15456
 	echo 'exec $$@' >> src_vipa.sh
0b15456
 	chmod 755 src_vipa.sh
0b15456
 
0b15456
@@ -44,7 +44,6 @@ install: src_vipa.so src_vipa.sh
0b15456
 	$(INSTALL) -m 755 src_vipa.so $(SRC_VIPA_PATH)
0b15456
 	$(INSTALL) -m 755 src_vipa.sh $(SRC_VIPA_STARTER_PATH)
0b15456
 	$(INSTALL) -m 644 src_vipa.8 $(SRC_VIPA_MANPAGE_PATH)/man8
0b15456
-	ldconfig
0b15456
 
0b15456
 clean:
0b15456
 	rm -f src_vipa.{i,s,o,sh,so} core src_vipa-$(VERSION).tar.gz
0b15456
-- 
0b15456
1.6.0.6
0b15456
0b15456
From 5c21f29f4d9e82942a997775c111280b85d01bb8 Mon Sep 17 00:00:00 2001
0b15456
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
0b15456
Date: Wed, 22 Apr 2009 12:53:55 +0200
0b15456
Subject: [PATCH] make the man page path and script path configurable
0b15456
0b15456
---
0b15456
 Makefile |    6 ++++--
0b15456
 1 files changed, 4 insertions(+), 2 deletions(-)
0b15456
0b15456
diff --git a/Makefile b/Makefile
0b15456
index d395fa8..365472b 100644
0b15456
--- a/Makefile
0b15456
+++ b/Makefile
0b15456
@@ -23,9 +23,11 @@ VERSION=2.0.4
0b15456
 LIBDIR=/usr/lib
0b15456
 SRC_VIPA_PATH=$(INSTROOT)$(LIBDIR)
0b15456
 # the path to the starter script
0b15456
-SRC_VIPA_STARTER_PATH=$(INSTROOT)/usr/sbin
0b15456
+SBINDIR=/usr/sbin
0b15456
+SRC_VIPA_STARTER_PATH=$(INSTROOT)$(SBINDIR)
0b15456
 # path to man page
0b15456
-SRC_VIPA_MANPAGE_PATH=$(INSTROOT)/usr/share/man
0b15456
+MANDIR=/usr/share/man
0b15456
+SRC_VIPA_MANPAGE_PATH=$(INSTROOT)$(MANDIR)
0b15456
 
0b15456
 all: src_vipa.so src_vipa.sh
0b15456
 
0b15456
-- 
0b15456
1.6.0.6
0b15456