[ldapvi] patch: GNUmakefile.in docdir support

Tom Canich tcanich at psu.edu
Wed Apr 8 15:03:14 CEST 2009


On Wed, Apr 08, 2009 at 09:10:16AM +0200, David Lichteblau wrote:
> The current version in git has a $(DESTDIR) in front of the path, will that
> still work with @docdir@?

I'm sorry David, I didn't notice the link to the current version...my
error! :)

Below is a patch against the current version.  It seems to work correctly 
with $(DESTDIR).

./configure --prefix=/tmp/ldapvi --docdir=/tmp/docs && \
	make && \
	make -n install DESTDIR=/tmp/foo
[...]
mkdir -p /tmp/foo/tmp/ldapvi/bin /tmp/foo/tmp/ldapvi/share/man/man1/
	/tmp/foo/tmp/docs
/bin/ginstall -c ldapvi /tmp/foo/tmp/ldapvi/bin
/bin/ginstall -c -m 644 ldapvi.1 /tmp/foo/tmp/ldapvi/share/man/man1/
/bin/ginstall -c -m 644 manual/manual.css manual/manual.xml 
	manual/bg.png manual/html.xsl /tmp/foo/tmp/docs

Tom



diff --git a/ldapvi/GNUmakefile.in b/ldapvi/GNUmakefile.in
index 2f1f065..ef0ce2e 100644
--- a/ldapvi/GNUmakefile.in
+++ b/ldapvi/GNUmakefile.in
@@ -25,10 +25,10 @@ ldapvi.1: version.h ldapvi ldapvi.1.in
 
 .PHONY: install
 install: ldapvi
-       mkdir -p $(DESTDIR)@bindir@ $(DESTDIR)@mandir@/man1/ $(DESTDIR)@prefix@/share/doc/ldapvi
+       mkdir -p $(DESTDIR)@bindir@ $(DESTDIR)@mandir@/man1/ $(DESTDIR)@docdir@
        @INSTALL_PROGRAM@ ldapvi $(DESTDIR)@bindir@
        @INSTALL_DATA@ ldapvi.1 $(DESTDIR)@mandir@/man1/
-       @INSTALL_DATA@ manual/manual.css manual/manual.xml manual/bg.png manual/html.xsl $(DESTDIR)@prefix@/share/doc/ldapvi
+       @INSTALL_DATA@ manual/manual.css manual/manual.xml manual/bg.png manual/html.xsl $(DESTDIR)@docdir@
 
 distclean:
        rm -rf configure GNUmakefile config.h config.log autom4te.cache config.status

--



More information about the ldapvi mailing list