Fixup configure files for CMake builds.

Author: bbockelm

CMakeLists.txt

@@ -40,28 +40,25 @@ add_library(globus_gridftp_server_hdfs MODULE
            )
 target_link_libraries(globus_gridftp_server_hdfs -lz -lrt -pthread ${HDFS_LIB} ${GLOBUS_GRIDFTP_SERVER_LIBRARIES} ${GLOBUS_COMMON_LIBRARIES} ${OPENSSL_LIBRARIES})
 
-if (NOT DEFINED LIB_INSTALL_DIR)
-  SET(LIB_INSTALL_DIR "lib")
-endif()
-
-if (NOT DEFINED SHARE_INSTALL_PREFIX)
-  SET(SHARE_INSTALL_PREFIX "share")
-endif()
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/gridftp-hdfs-standalone.in ${CMAKE_CURRENT_BINARY_DIR}/scripts/gridftp-hdfs-standalone @ONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/init/gridftp-hdfs.in ${CMAKE_CURRENT_BINARY_DIR}/scripts/init/gridftp-hdfs @ONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/xinetd/gridftp-hdfs.in ${CMAKE_CURRENT_BINARY_DIR}/scripts/xinetd/gridftp-hdfs @ONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/xinetd/gridftp-hdfs-inetd.in ${CMAKE_CURRENT_BINARY_DIR}/scripts/xinetd/gridftp-hdfs-inetd @ONLY)
 
-if (NOT DEFINED SYSCONF_INSTALL_DIR)
-  SET(SYSCONF_INSTALL_DIR "etc")
-endif()
+SET(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE INTERNAL "Install path for libraries")
+SET(SHARE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/share" CACHE INTERNAL "Data directory for helper files")
+SET(SYSCONF_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/etc" CACHE INTERNAL "System configuration directory")
 
 install(
   TARGETS globus_gridftp_server_hdfs
   LIBRARY DESTINATION ${LIB_INSTALL_DIR} )
 
 install(
-  PROGRAMS scripts/gridftp-hdfs-standalone
+  PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/scripts/gridftp-hdfs-standalone
   DESTINATION bin)
 
 install(
-  PROGRAMS scripts/xinetd/gridftp-hdfs-inetd
+  PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/scripts/xinetd/gridftp-hdfs-inetd
   DESTINATION sbin)
 
 set_target_properties(
@@ -76,6 +73,11 @@ install(
   DESTINATION ${SYSCONF_INSTALL_DIR}/gridftp-hdfs
 )
 
+install(
+  FILES ${CMAKE_CURRENT_BINARY_DIR}/scripts/init/gridftp-hdfs
+  DESTINATION ${SYSCONF_INSTALL_DIR}/init.d/
+)
+
 install(
   FILES ${CMAKE_SOURCE_DIR}/conf/gridftp-hdfs ${CMAKE_SOURCE_DIR}/conf/gridftp-hdfs-environment-bootstrap
   DESTINATION ${SYSCONF_INSTALL_DIR}/sysconfig/gridftp.conf.d

scripts/gridftp-hdfs-standalone.in

@@ -1,9 +1,9 @@
 #!/bin/sh
 
-OSG_CONFIG= /usr/share/osg/sysconfig/globus-gridftp-server-plugin
+OSG_CONFIG=@SHARE_INSTALL_PREFIX@/osg/sysconfig/globus-gridftp-server-plugin
 [ -e $OSG_CONFIG ] && . $OSG_CONFIG
 
 export CLASSPATH=$CLASSPATH
 
-exec /usr/sbin/globus-gridftp-server -c @sysconfdir_resolved@/gridftp-hdfs/gridftp-debug.conf -dsi hdfs -no-fork
+exec /usr/sbin/globus-gridftp-server -c @SYSCONF_INSTALL_DIR@/gridftp-hdfs/gridftp-debug.conf -dsi hdfs -no-fork
 

scripts/init/gridftp-hdfs.in

@@ -9,21 +9,21 @@
 # Source function library.
 . /etc/rc.d/init.d/functions
 
-exec="@sbindir_resolved@/globus-gridftp-server"
+exec="@CMAKE_INSTALL_PREFIX@/sbin/globus-gridftp-server"
 prog="gridftp-hdfs"
-config="@sysconfdir_resolved@/gridftp-hdfs/gridftp.conf"
+config="@SYSCONF_INSTALL_DIR@/gridftp-hdfs/gridftp.conf"
 
-. @datadir_resolved@/$prog/$prog-environment
+. @SHARE_INSTALL_PREFIX@/$prog/$prog-environment
 
-[ -e @sysconfdir_resolved@/sysconfig/gridftp.conf.d/$prog ] && . @sysconfdir_resolved@/sysconfig/gridftp.conf.d/$prog
+[ -e @SYSCONF_INSTALL_DIR@/sysconfig/gridftp.conf.d/$prog ] && . @SYSCONF_INSTALL_DIR@/sysconfig/gridftp.conf.d/$prog
 
-lockfile=@localstatedir_resolved@/lock/subsys/$prog
+lockfile=/var/lock/subsys/$prog
 
 start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
     echo -n $"Starting $prog: "
-    daemon $exec -c $config -pidfile @localstatedir_resolved@/run/$prog.pid
+    daemon $exec -c $config -pidfile /var/run/$prog.pid
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile

scripts/xinetd/gridftp-hdfs-inetd.in

@@ -1,7 +1,7 @@
 #!/bin/sh
 
-OSG_CONFIG= /usr/share/osg/sysconfig/globus-gridftp-server-plugin
+OSG_CONFIG=@SHARE_INSTALL_PREFIX@/osg/sysconfig/globus-gridftp-server-plugin
 [ -e $OSG_CONFIG ] && . $OSG_CONFIG
 
-exec /usr/sbin/globus-gridftp-server -c @sysconfdir_resolved@/gridftp-hdfs/gridftp-inetd.conf -dsi hdfs
+exec /usr/sbin/globus-gridftp-server -c @SYSCONF_INSTALL_DIR@/gridftp-hdfs/gridftp-inetd.conf -dsi hdfs
 

scripts/xinetd/gridftp-hdfs.in

@@ -6,6 +6,6 @@ service gsiftp
     user        = root
     instances   = UNLIMITED
     cps         = 400 10
-    server      = @prefix_resolved@/sbin/gridftp-hdfs-inetd
+    server      = @CMAKE_INSTALL_PREFIX@/sbin/gridftp-hdfs-inetd
     disable     = yes
 }