From mboxrd@z Thu Jan  1 00:00:00 1970
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch,
	master, updated. 397eafa577ddeab9511ffc23fcf1271527a0de47
Date: Sat, 23 Jun 2012 18:25:51 +0200
Message-ID: <20120623162552.71DB320095@argus.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0545303065083938823=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============0545303065083938823==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  397eafa577ddeab9511ffc23fcf1271527a0de47 (commit)
      from  b2a949143087fb84a6161283ad16e905bf91d55d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 397eafa577ddeab9511ffc23fcf1271527a0de47
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Jun 23 18:25:40 2012 +0200

    ldapvi: Fix installation of files.

-----------------------------------------------------------------------

Summary of changes:
 ldapvi/ldapvi.nm                    |    6 +-----
 ldapvi/patches/GNUmakefile.in.patch |   24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 ldapvi/patches/GNUmakefile.in.patch

Difference in files:
diff --git a/ldapvi/ldapvi.nm b/ldapvi/ldapvi.nm
index 63c5d9e..fb0ff9c 100644
--- a/ldapvi/ldapvi.nm
+++ b/ldapvi/ldapvi.nm
@@ -5,7 +5,7 @@
=20
 name       =3D ldapvi
 version    =3D 1.7
-release    =3D 1
+release    =3D 2
=20
 groups     =3D Applications/Editors
 url        =3D http://www.lichteblau.com/ldapvi/
@@ -36,10 +36,6 @@ build
 			sed -e "s/getline/_&/g" -i $i
 		done
 	end
-
-	install
-		make install prefix=3D%{BUILDROOT}/usr
-	end
 end
=20
 packages
diff --git a/ldapvi/patches/GNUmakefile.in.patch b/ldapvi/patches/GNUmakefile=
.in.patch
new file mode 100644
index 0000000..11afafe
--- /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:=3D@INSTALL@
+ prefix:=3D@prefix@
+ exec_prefix:=3D@exec_prefix@
++datarootdir:=3D@datarootdir@
+=20
+ all: ldapvi
+=20
+@@ -25,10 +26,9 @@
+=20
+ .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@/sh=
are/doc/ldapvi
++	@INSTALL_PROGRAM@ ldapvi $(DESTDIR)@bindir@
++	@INSTALL_PROGRAM@ -m 644 ldapvi.1 $(DESTDIR)@mandir@/man1/
+=20
+ distclean:
+ 	rm -rf configure GNUmakefile config.h config.log autom4te.cache config.sta=
tus


hooks/post-receive
--
IPFire 3.x development tree

--===============0545303065083938823==--