From 2ea1e13a2cd3a22587d0fc9f9f5785b77009a792 Mon Sep 17 00:00:00 2001 From: Matthew Johnson Date: Sun, 22 Jun 2008 21:44:41 +0100 Subject: Author: Omair Majid Date: Fri Jun 20 12:41:49 2008 -0400 added JAVADOCPREFIX to allow overriding the installation location of javadocs when doing make install --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 664413c..850daf5 100644 --- a/Makefile +++ b/Makefile @@ -33,6 +33,8 @@ JARPREFIX?=$(PREFIX)/share/java BINPREFIX?=$(PREFIX)/bin DOCPREFIX?=$(PREFIX)/share/doc/libdbus-java MANPREFIX?=$(PREFIX)/share/man/man1 +# allows overriding the javadoc install location from command line +JAVADOCPREFIX?=$(DOCPREFIX) # Installation directory of the java-unix libraries JAVAUNIXLIBDIR?=/usr/lib/jni @@ -271,8 +273,8 @@ install-doc: doc install -d $(DESTDIR)$(DOCPREFIX)/dbus-java install -m 644 doc/dbus-java/*.html $(DESTDIR)$(DOCPREFIX)/dbus-java install -m 644 doc/dbus-java/*.css $(DESTDIR)$(DOCPREFIX)/dbus-java - install -d $(DESTDIR)$(DOCPREFIX)/api - cp -a doc/api/* $(DESTDIR)$(DOCPREFIX)/api + install -d $(DESTDIR)$(JAVADOCPREFIX)/api + cp -a doc/api/* $(DESTDIR)$(JAVADOCPREFIX)/api dist: .dist .dist: $(DISTFILES) -- cgit v1.2.3