public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
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	[thread overview]
Message-ID: <20120623162552.71DB320095@argus.ipfire.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 2777 bytes --]

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 @@
 
 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 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:=@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


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

                 reply	other threads:[~2012-06-23 16:25 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120623162552.71DB320095@argus.ipfire.org \
    --to=git@ipfire.org \
    --cc=ipfire-scm@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox