From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 23 Jun 2012 16:25:40 +0000 (+0200)
Subject: ldapvi: Fix installation of files.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=397eafa577ddeab9511ffc23fcf1271527a0de47;p=ipfire-3.x.git

ldapvi: Fix installation of files.
---

diff --git a/ldapvi/ldapvi.nm b/ldapvi/ldapvi.nm
index 63c5d9e27..fb0ff9c8b 100644
--- a/ldapvi/ldapvi.nm
+++ b/ldapvi/ldapvi.nm
@@ -5,7 +5,7 @@
 
 name       = ldapvi
 version    = 1.7
-release    = 1
+release    = 2
 
 groups     = Applications/Editors
 url        = http://www.lichteblau.com/ldapvi/
@@ -36,10 +36,6 @@ build
 			sed -e "s/getline/_&/g" -i $i
 		done
 	end
-
-	install
-		make install prefix=%{BUILDROOT}/usr
-	end
 end
 
 packages
diff --git a/ldapvi/patches/GNUmakefile.in.patch b/ldapvi/patches/GNUmakefile.in.patch
new file mode 100644
index 000000000..11afafef3
--- /dev/null
+++ b/ldapvi/patches/GNUmakefile.in.patch
@@ -0,0 +1,24 @@
+--- ldapvi-1.7/GNUmakefile.in	2007-05-05 11:17:26.000000000 +0100
++++ GNUmakefile.in	2007-07-05 13:34:33.000000000 +0100
+@@ -4,6 +4,7 @@
+ INSTALL:=@INSTALL@
+ prefix:=@prefix@
+ exec_prefix:=@exec_prefix@
++datarootdir:=@datarootdir@
+ 
+ all: ldapvi
+ 
+@@ -25,10 +26,9 @@
+ 
+ .PHONY: install
+ install: ldapvi
+-	mkdir -p @bindir@ @mandir@/man1/ @prefix@/share/doc/ldapvi
+-	@INSTALL_PROGRAM@ ldapvi @bindir@
+-	@INSTALL_PROGRAM@ -m 644 ldapvi.1 @mandir@/man1/
+-	@INSTALL_PROGRAM@ -m 644 manual/manual.css manual/manual.xml manual/bg.png manual/html.xsl @prefix@/share/doc/ldapvi
++	mkdir -p $(DESTDIR)@bindir@ $(DESTDIR)@mandir@/man1/ $(DESTDIR)@prefix@/share/doc/ldapvi
++	@INSTALL_PROGRAM@ ldapvi $(DESTDIR)@bindir@
++	@INSTALL_PROGRAM@ -m 644 ldapvi.1 $(DESTDIR)@mandir@/man1/
+ 
+ distclean:
+ 	rm -rf configure GNUmakefile config.h config.log autom4te.cache config.status