Added install rules for man pages

6 files changed, 45 insertions, 6 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8ee0d0f..c5ba828 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,6 +37,7 @@ SET(PREFIX "/usr/local" CACHE STRING "Install prefix for eurephia")
 SET(BINDIR "/usr/local/bin" CACHE STRING "Directory for eurephia binaries")
 SET(PLUGINDIR "/usr/local/lib/eurephia" CACHE STRING "Plug-in path for the eurephia modules")
 SET(XSLTROOT "/usr/local/share/eurephia/xslt" CACHE STRING "Root path for the XSLT templates")
+SET(MANDIR "/usr/local/share/man" CACHE STRING "Path where to install man pages")
 
 # Set install prefix
 SET(CMAKE_INSTALL_PREFIX ${PREFIX})
@@ -178,3 +179,6 @@ IF(DEBUG)
 		ADD_DEFINITIONS(-DSHOW_SECRETS)
 	ENDIF(SHOW_SECRETS)
 ENDIF(DEBUG)
+
+# Install generic man pages
+INSTALL(FILES man/eurephia-variables.7 DESTINATION ${MANDIR}/man7)
diff --git a/configure b/configure
index 9ded67a..efa5be1 100755
--- a/configure
+++ b/configure
@@ -31,6 +31,8 @@ XSLTPATH="${PREFIX}/share/eurephia/xslt"
 XSLTPATH_SET=0
 EUREPHIADM_XSLT="${XSLTPATH}/eurephiadm"
 EUREPHIADM_XSLT_SET=0
+MANDIR="${PREFIX}/share/man"
+MANDIR_SET=0
 SQLITE3PREFIX="/etc/openvpn"
 
 #
@@ -75,6 +77,7 @@ configure help for eurephia
                                               (default: ${EUREPHIADM_XSLT})
    ** Documentation
           --doxygen                        -- Compile Doxygen developer documentation
+          --man-prefix                     -- Installation prefix for man pages
 
 EOF
 }
@@ -114,6 +117,10 @@ while [ ! -z "$1" ]; do
                       EUREPHIADM_XSLT="${XSLTPATH}/eurephiadm"
                   fi
               fi
+              # Apply prefix to man page directory only if not been set explicitly earlier
+              if [ "${MANDIR_SET}" = "0" ]; then
+                  MANDIR="${PREFIX}/share/man"
+              fi
               ;;
           --bin-dir)
               BINDIR="$2"
@@ -188,6 +195,10 @@ while [ ! -z "$1" ]; do
               PARAMS="${PARAMS} -DDOXYGEN=ON"
               DOXY_DISTCLEAN="rm -r doxygen/eurephia-devel"
               ;;
+          --man-dir)
+              MANDIR="$2"
+              shift
+              ;;
           *)
               echo "Unkown option: $1"
               exit 2
@@ -237,7 +248,7 @@ EOF
     cmake . ${PARAMS} -DPREFIX:STRING=${PREFIX} -DCMAKE_INSTALL_PREFIX:STRING=${PREFIX} \
         -DPLUGINDIR:STRING=${PLUGINDIR} -DBINDIR:STRING=${BINDIR} \
         -DEUREPHIADM_XSLT_PATH:STRING=${EUREPHIADM_XSLT} -DXSLTROOT:STRING=${XSLTPATH} \
-        -DCFLAGS:STRING="${CFLAGS}"
+        -DMANDIR:STRING=${MANDIR} -DCFLAGS:STRING="${CFLAGS}"
     export ec=$?
 
     # If cmake exited without failure, provide some info about the configuration
@@ -257,6 +268,7 @@ EOF
         echo
         echo "         Install prefix: ${PREFIX}"
         echo "           Binaries dir: ${BINDIR}"
+        echo "          Man pages dir: ${MANDIR}"
         echo "           Plug-in path: ${PLUGINDIR}"
         if [ ! -z "${ADMIN}" ]; then
             echo "         XSLT base path: ${XSLTPATH}"
diff --git a/database/sqlite/CMakeLists.txt b/database/sqlite/CMakeLists.txt
index 6a0fe2b..2709fbc 100644
--- a/database/sqlite/CMakeLists.txt
+++ b/database/sqlite/CMakeLists.txt
@@ -92,6 +92,7 @@ SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES eurephiadb)
 # Install instructions
 #
 INSTALL(TARGETS edb-sqlite LIBRARY DESTINATION ${PLUGINDIR})
+INSTALL(FILES edb-sqlite.7 DESTINATION ${MANDIR}/man7)
 IF(SQLITE3BIN)
   INSTALL(FILES eurephiadb DESTINATION ${SQLITE3PREFIX}/ RENAME eurephiadb-template)
 ENDIF(SQLITE3BIN)
diff --git a/eurephia.spec b/eurephia.spec
index 03a76ea..a779433 100644
--- a/eurephia.spec
+++ b/eurephia.spec
@@ -71,6 +71,7 @@ hash salt.
 
 %prep 
 %setup -q -b0 -n %{name}-%{version}%{?betatag:_%{betatag}}
+# This is needed to ship extra until openvpn-plugin.h becomes part of the OpenVPN RPM
 cp -v %{_sourcedir}/openvpn-plugin.h %{_builddir}/%{name}-%{version}%{?betatag:_%{betatag}}/
 
 %build
@@ -82,9 +83,8 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 install -m 755 utils/eurephia_init $RPM_BUILD_ROOT/%{_bindir}
 install -m 755 utils/eurephia_saltdecode $RPM_BUILD_ROOT/%{_bindir}
-mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man8
-install -m 644 utils/eurephia_init.8 $RPM_BUILD_ROOT/%{_mandir}/man8/
-install -m 644 utils/eurephia_saltdecode.8 $RPM_BUILD_ROOT/%{_mandir}/man8/
+install -m 644 utils/eurephia_init.7 $RPM_BUILD_ROOT/%{_mandir}/man7/
+install -m 644 utils/eurephia_saltdecode.7 $RPM_BUILD_ROOT/%{_mandir}/man7/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -94,12 +94,15 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc LICENSE.txt CREDITS.txt
 %{_libdir}/eurephia/eurephia-auth.so
+%{_mandir}/man7/eurephia-auth.7.gz
+%{_mandir}/man7/eurephia-variables.7.gz
 
 %files sqlite3
 %defattr(-,root,root,-)
 %doc LICENSE.txt CREDITS.txt
 %{_libdir}/eurephia/edb-sqlite.so
 %{_localstatedir}/lib/eurephia/
+%{_mandir}/man7/edb-sqlite.7.gz
 
 %files iptables
 %defattr(-,root,root,-)
@@ -110,19 +113,21 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc LICENSE.txt CREDITS.txt
 %{_bindir}/eurephia_init
-%{_mandir}/man8/eurephia_init.8.gz
+%{_mandir}/man7/eurephia_init.7.gz
 
 %files admin
 %defattr(-,root,root,-)
 %doc LICENSE.txt CREDITS.txt
 %{_bindir}/eurephiadm
 %{_datadir}/eurephia/xslt/eurephiadm
+%{_mandir}/man7/eurephiadm.7.gz
+%{_mandir}/man7/eurephiadm-*.7.gz
 
 %files utils
 %defattr(-,root,root,-)
 %doc LICENSE.txt CREDITS.txt
 %{_bindir}/eurephia_saltdecode
-%{_mandir}/man8/eurephia_saltdecode.8.gz
+%{_mandir}/man7/eurephia_saltdecode.7.gz
 
 %changelog
 * Wed Jun 30 2010 David Sommerseth <dazo@users.sourceforge.net> - 1.0.0-1
diff --git a/eurephiadm/CMakeLists.txt b/eurephiadm/CMakeLists.txt
index ed30c53..51f9d83 100644
--- a/eurephiadm/CMakeLists.txt
+++ b/eurephiadm/CMakeLists.txt
@@ -52,12 +52,28 @@ ADD_EXECUTABLE(eurephiadm
         commands/fwprofiles.c
         ../common/eurephiadb_session_common.c
 )
+
+# Man pages to install
+SET(MAN_PAGES
+  man/eurephiadm.7
+  man/eurephiadm-adminaccess.7
+  man/eurephiadm-attempts.7
+  man/eurephiadm-blacklist.7
+  man/eurephiadm-certs.7
+  man/eurephiadm-config.7
+  man/eurephiadm-fwprofiles.7
+  man/eurephiadm-lastlog.7
+  man/eurephiadm-usercerts.7
+  man/eurephiadm-users.7
+)
+
 # Link in the following dynamic libraries with eurephiadm.
 # ${EXTRA_LIBS} contains libxml2, libxslt and openssl library names
 TARGET_LINK_LIBRARIES(eurephiadm dl crypto common ${EXTRA_LIBS})
 
 # Install rules for eurephiadm
 INSTALL(TARGETS eurephiadm RUNTIME DESTINATION ${BINDIR})
+INSTALL(FILES ${MAN_PAGES} DESTINATION ${MANDIR}/man7)
 
 # Also run the rules for the XSLT templates eurephiadm needs
 SUBDIRS(../xslt/eurephiadm)
diff --git a/plugin/CMakeLists.txt b/plugin/CMakeLists.txt
index 711fb05..d644961 100644
--- a/plugin/CMakeLists.txt
+++ b/plugin/CMakeLists.txt
@@ -78,6 +78,7 @@ TARGET_LINK_LIBRARIES(eurephia-auth dl pthread rt crypto common)
 
 # Install rules
 INSTALL(TARGETS eurephia-auth  LIBRARY DESTINATION ${PLUGINDIR})
+INSTALL(FILES eurephia-auth.7 DESTINATION ${MANDIR}/man7)
 
 # If subdirs contains more directories with build/install rules, do that
 IF(subdirs)