Fixed ICE-5356 - Consider adding man pages for unix executables

17 files changed, 27 insertions, 1 deletions

diff --git a/cpp/Makefile b/cpp/Makefile
index e5df3fc9a9f..235e41ef348 100644
--- a/cpp/Makefile
+++ b/cpp/Makefile
@@ -17,7 +17,8 @@ ifeq ($(shell uname | grep MINGW),)
 SUBDIRS		:= $(SUBDIRS) demo
 endif
 
-INSTALL_SUBDIRS	= $(install_bindir) $(install_libdir) $(install_includedir) $(install_configdir)
+INSTALL_SUBDIRS	= $(install_bindir) $(install_libdir) $(install_includedir) \
+	$(install_configdir) $(install_mandir)
 
 install:: install-common
 	@for subdir in $(INSTALL_SUBDIRS); \
diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules
index f5acdc18117..fbf6fe759b5 100644
--- a/cpp/config/Make.rules
+++ b/cpp/config/Make.rules
@@ -192,6 +192,12 @@ install_bindir	  	:= $(prefix)/$(binsubdir)$(cpp11suffix)
 install_libdir	  	:= $(prefix)/$(libsubdir)$(cpp11suffix)
 install_configdir 	:= $(prefix)/config
 
+ifneq ($(prefix),/usr)
+install_mandir		:= $(prefix)/man/man1
+else
+install_mandir		:= $(prefix)/share/man/man1
+endif
+
 ifneq ($(embedded_runpath_prefix),)
     runpath_libdir	:= $(embedded_runpath_prefix)/$(libsubdir)
 else
diff --git a/cpp/src/FreezeScript/Makefile b/cpp/src/FreezeScript/Makefile
index f2a90b8b8c0..f78cdb68be1 100644
--- a/cpp/src/FreezeScript/Makefile
+++ b/cpp/src/FreezeScript/Makefile
@@ -58,6 +58,8 @@ $(DUMPDB): $(DUMP_OBJS) $(COMMON_OBJS)
 
 install:: all
 	$(call installprogram,$(TRANSFORMDB),$(install_bindir))
+	$(call installdata,$(top_srcdir)/../man/man1/transformdb.1,$(install_mandir))
 	$(call installprogram,$(DUMPDB),$(install_bindir))
+	$(call installdata,$(top_srcdir)/../man/man1/dumpdb.1,$(install_mandir))
 
 include .depend
diff --git a/cpp/src/Glacier2/Makefile b/cpp/src/Glacier2/Makefile
index d7fecfb8116..b6ae0beef59 100644
--- a/cpp/src/Glacier2/Makefile
+++ b/cpp/src/Glacier2/Makefile
@@ -44,5 +44,6 @@ $(ROUTER): $(OBJS)
 
 install:: all
 	$(call installprogram,$(ROUTER),$(install_bindir))
+	$(call installdata,$(top_srcdir)/../man/man1/glacier2router.1,$(install_mandir))
 
 include .depend
diff --git a/cpp/src/IceBox/Makefile b/cpp/src/IceBox/Makefile
index a2dfc5abc59..16a16909dc1 100644
--- a/cpp/src/IceBox/Makefile
+++ b/cpp/src/IceBox/Makefile
@@ -71,6 +71,8 @@ $(ADMIN): $(AOBJS) $(LIBTARGETS)
 install:: all
 	$(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME))
 	$(call installprogram,$(SERVER),$(install_bindir))
+	$(call installdata,$(top_srcdir)/../man/man1/icebox.1,$(install_mandir))
 	$(call installprogram,$(ADMIN),$(install_bindir))
+	$(call installdata,$(top_srcdir)/../man/man1/iceboxadmin.1,$(install_mandir))
 
 include .depend
diff --git a/cpp/src/IceGrid/Makefile b/cpp/src/IceGrid/Makefile
index 21509cc8725..16bf43da4a0 100644
--- a/cpp/src/IceGrid/Makefile
+++ b/cpp/src/IceGrid/Makefile
@@ -120,8 +120,11 @@ $(NODE_SERVER): $(NODE_SVR_OBJS) $(LIBTARGETS)
 
 install:: all
 	$(call installprogram,$(ADMIN),$(install_bindir))
+	$(call installdata,$(top_srcdir)/../man/man1/icegridadmin.1,$(install_mandir))
 	$(call installprogram,$(NODE_SERVER),$(install_bindir))
+	$(call installdata,$(top_srcdir)/../man/man1/icegridnode.1,$(install_mandir))
 	$(call installprogram,$(REGISTRY_SERVER),$(install_bindir))
+	$(call installdata,$(top_srcdir)/../man/man1/icegridregistry.1,$(install_mandir))
 
 SUBDIRS = FreezeDB
 
diff --git a/cpp/src/IceStorm/Makefile b/cpp/src/IceStorm/Makefile
index bfa29a83eeb..bdea303748d 100644
--- a/cpp/src/IceStorm/Makefile
+++ b/cpp/src/IceStorm/Makefile
@@ -92,6 +92,7 @@ $(ADMIN): $(AOBJS) $(LIBTARGETS)
 install:: all
 	$(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME))
 	$(call installprogram,$(ADMIN),$(install_bindir))
+	$(call installdata,$(top_srcdir)/../man/man1/icestormadmin.1,$(install_mandir))
 
 SUBDIRS = FreezeDB
 
diff --git a/cpp/src/ca/Makefile b/cpp/src/ca/Makefile
index d526abd4301..c583c6f9197 100644
--- a/cpp/src/ca/Makefile
+++ b/cpp/src/ca/Makefile
@@ -40,6 +40,7 @@ install::
 	    $(INSTALL_PROGRAM) $$i $(prefix)/bin ;\
 	    chmod a+x $(prefix)/bin/$$i ;\
 	done
+	$(call installdata,$(top_srcdir)/../man/man1/iceca.1,$(install_mandir))
 	@for i in $(CLASS_FILES) ; \
 	do \
 	    echo "Installing $$i" ; \
diff --git a/cpp/src/slice2cpp/Makefile b/cpp/src/slice2cpp/Makefile
index aaa9802b30d..ca84a62293e 100644
--- a/cpp/src/slice2cpp/Makefile
+++ b/cpp/src/slice2cpp/Makefile
@@ -34,5 +34,6 @@ $(NAME): $(OBJS)
 
 install:: all
 	$(call installprogram,$(NAME),$(install_bindir))
+	$(call installdata,$(top_srcdir)/../man/man1/slice2cpp.1,$(install_mandir))
 
 include .depend
diff --git a/cpp/src/slice2cs/Makefile b/cpp/src/slice2cs/Makefile
index 0752340c71a..0e651ea4558 100644
--- a/cpp/src/slice2cs/Makefile
+++ b/cpp/src/slice2cs/Makefile
@@ -34,5 +34,6 @@ $(NAME): $(OBJS)
 
 install:: all
 	$(call installprogram,$(NAME),$(install_bindir))
+	$(call installdata,$(top_srcdir)/../man/man1/slice2cs.1,$(install_mandir))
 
 include .depend
diff --git a/cpp/src/slice2freeze/Makefile b/cpp/src/slice2freeze/Makefile
index aa77709c0b2..74bb1d863f0 100644
--- a/cpp/src/slice2freeze/Makefile
+++ b/cpp/src/slice2freeze/Makefile
@@ -33,5 +33,6 @@ $(NAME): $(OBJS)
 
 install:: all
 	$(call installprogram,$(NAME),$(install_bindir))
+	$(call installdata,$(top_srcdir)/../man/man1/slice2freeze.1,$(install_mandir))
 
 include .depend
diff --git a/cpp/src/slice2freezej/Makefile b/cpp/src/slice2freezej/Makefile
index 70792bb7848..fae4e0d0583 100644
--- a/cpp/src/slice2freezej/Makefile
+++ b/cpp/src/slice2freezej/Makefile
@@ -33,5 +33,6 @@ $(NAME): $(OBJS)
 
 install:: all
 	$(call installprogram,$(NAME),$(install_bindir))
+	$(call installdata,$(top_srcdir)/../man/man1/slice2freezej.1,$(install_mandir))
 
 include .depend
diff --git a/cpp/src/slice2html/Makefile b/cpp/src/slice2html/Makefile
index 311c68f2631..ad86a79bc06 100644
--- a/cpp/src/slice2html/Makefile
+++ b/cpp/src/slice2html/Makefile
@@ -34,5 +34,6 @@ $(NAME): $(OBJS)
 
 install:: all
 	$(call installprogram,$(NAME),$(install_bindir))
+	$(call installdata,$(top_srcdir)/../man/man1/slice2html.1,$(install_mandir))
 
 include .depend
diff --git a/cpp/src/slice2java/Makefile b/cpp/src/slice2java/Makefile
index 5a4ffe89a6f..4cf6250227f 100644
--- a/cpp/src/slice2java/Makefile
+++ b/cpp/src/slice2java/Makefile
@@ -34,5 +34,6 @@ $(NAME): $(OBJS)
 
 install:: all
 	$(call installprogram,$(NAME),$(install_bindir))
+	$(call installdata,$(top_srcdir)/../man/man1/slice2java.1,$(install_mandir))
 
 include .depend
diff --git a/cpp/src/slice2php/Makefile b/cpp/src/slice2php/Makefile
index 27bee378f91..9b6b005837b 100644
--- a/cpp/src/slice2php/Makefile
+++ b/cpp/src/slice2php/Makefile
@@ -33,5 +33,6 @@ $(NAME): $(OBJS)
 
 install:: all
 	$(call installprogram,$(NAME),$(install_bindir))
+	$(call installdata,$(top_srcdir)/../man/man1/slice2php.1,$(install_mandir))
 
 include .depend
diff --git a/cpp/src/slice2py/Makefile b/cpp/src/slice2py/Makefile
index 98f6aec4ff7..e7aba2e2161 100644
--- a/cpp/src/slice2py/Makefile
+++ b/cpp/src/slice2py/Makefile
@@ -33,5 +33,6 @@ $(NAME): $(OBJS)
 
 install:: all
 	$(call installprogram,$(NAME),$(install_bindir))
+	$(call installdata,$(top_srcdir)/../man/man1/slice2py.1,$(install_mandir))
 
 include .depend
diff --git a/cpp/src/slice2rb/Makefile b/cpp/src/slice2rb/Makefile
index 0cd29414326..b9d51c356a1 100644
--- a/cpp/src/slice2rb/Makefile
+++ b/cpp/src/slice2rb/Makefile
@@ -33,5 +33,6 @@ $(NAME): $(OBJS)
 
 install:: all
 	$(call installprogram,$(NAME),$(install_bindir))
+	$(call installdata,$(top_srcdir)/../man/man1/slice2rb.1,$(install_mandir))
 
 include .depend