summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Johnson <mjj29@adonis.trinhall.cam.ac.uk>2006-11-14 16:32:52 +0000
committerMatthew Johnson <mjj29@adonis.trinhall.cam.ac.uk>2006-11-14 16:32:52 +0000
commit547073e01fc0e17b010aec9c0b087a8e23e4f497 (patch)
tree6907ed3cc9e962dbab7155b8462f7592f745ebd0
parentd62f325b9cb77d2c2000d66c255908d2a57bc842 (diff)
split install-man and install-doc1.11
-rw-r--r--INSTALL2
-rw-r--r--Makefile13
-rw-r--r--changelog1
3 files changed, 10 insertions, 6 deletions
diff --git a/INSTALL b/INSTALL
index 50bab41..d59f76f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -31,7 +31,7 @@ directories can be achieved using the BINDIR etc variables. For more detail
read the Makefile.
Documentation for the bindings can be built with `make doc' and installed with
-`make install-doc', with the same provisos for installation paths.
+`make install-doc install-man', with the same provisos for installation paths.
Using the Bindings
------------------
diff --git a/Makefile b/Makefile
index 5ef0fa5..5e5f4f6 100644
--- a/Makefile
+++ b/Makefile
@@ -202,13 +202,20 @@ install: dbus-java-viewer-$(VERSION).jar libdbus-java-$(VERSION).jar libdbus-jav
sed 's,\%JARPATH\%,$(RUNJARPREFIX),;s,\%LIBPATH\%,$(RUNLIBPREFIX),' < bin/ListDBus > $(BINPREFIX)/ListDBus
chmod +x $(BINPREFIX)/ListDBus
-install-doc: doc CreateInterface.1 ListDBus.1 DBusViewer.1 changelog AUTHORS COPYING README INSTALL
+install-man: CreateInterface.1 ListDBus.1 DBusViewer.1 changelog AUTHORS COPYING README INSTALL
install -d $(DOCPREFIX)
install -m 644 changelog $(DOCPREFIX)
install -m 644 COPYING $(DOCPREFIX)
install -m 644 AUTHORS $(DOCPREFIX)
install -m 644 README $(DOCPREFIX)
install -m 644 INSTALL $(DOCPREFIX)
+ install -d $(MANPREFIX)
+ install -m 644 CreateInterface.1 $(MANPREFIX)/CreateInterface.1
+ install -m 644 ListDBus.1 $(MANPREFIX)/ListDBus.1
+ install -m 644 DBusViewer.1 $(MANPREFIX)/DBusViewer.1
+
+install-doc: doc
+ install -d $(DOCPREFIX)
install -m 644 doc/dbus-java.dvi $(DOCPREFIX)
install -m 644 doc/dbus-java.ps $(DOCPREFIX)
install -m 644 doc/dbus-java.pdf $(DOCPREFIX)
@@ -218,10 +225,6 @@ install-doc: doc CreateInterface.1 ListDBus.1 DBusViewer.1 changelog AUTHORS COP
install -m 644 doc/dbus-java/*.png $(DOCPREFIX)/dbus-java
install -d $(DOCPREFIX)/api
cp -a doc/api/* $(DOCPREFIX)/api
- install -d $(MANPREFIX)
- install -m 644 CreateInterface.1 $(MANPREFIX)/CreateInterface.1
- install -m 644 ListDBus.1 $(MANPREFIX)/ListDBus.1
- install -m 644 DBusViewer.1 $(MANPREFIX)/DBusViewer.1
dist: .dist
.dist: bin dbus-java.c dbus-java.tex Makefile org tmp-session.conf CreateInterface.sgml ListDBus.sgml DBusViewer.sgml changelog AUTHORS COPYING README INSTALL
diff --git a/changelog b/changelog
index 52a6c58..6fdc2de 100644
--- a/changelog
+++ b/changelog
@@ -1,6 +1,7 @@
Version 1.11:
* fix script replacement directories to be different to install directories
+ * split install-doc and install-man to allow easy split -doc package
Version 1.10: