Only in pcp-2.3.0: configure diff -ru pcp-2.3.0/configure.in pcp-2.3.0.nonroot/configure.in --- pcp-2.3.0/configure.in Thu Nov 21 19:17:54 2002 +++ pcp-2.3.0.nonroot/configure.in Sun Dec 8 15:35:05 2002 @@ -875,38 +875,53 @@ dnl rc/startup files dnl The place should be a REAL directory, ie not a symlink -for d in /etc/rc.d/init.d /sbin/init.d /etc/init.d ; do - if test -d $d -a ! -L $d ; then - pcp_rc_dir=$d - break; +if test ! -z "$PCP_RC_DIR" +then + pcp_rc_dir=$PCP_RC_DIR +else + for d in /etc/rc.d/init.d /sbin/init.d /etc/init.d ; do + if test -d $d -a ! -L $d ; then + pcp_rc_dir=$d + break; + fi + done + if test -z "$pcp_rc_dir" ; then + pcp_rc_dir=/etc fi -done -if test -z "$pcp_rc_dir" ; then - pcp_rc_dir=/etc fi AC_SUBST(pcp_rc_dir) dnl rc sysconfig dir -if test -d /etc/sysconfig +if test ! -z "$PCP_SYSCONFIG_DIR" then - pcp_sysconfig_dir=/etc/sysconfig + pcp_sysconfig_dir=$PCP_SYSCONFIG_DIR else - dnl we are _not_ going to use the sysconfig control mechanism to - dnl enable/disable pmcd, pmlogger, pmie, ... during the "rc" start - dnl and stop scripts - pcp_sysconfig_dir= + if test -d /etc/sysconfig + then + pcp_sysconfig_dir=/etc/sysconfig + else + dnl we are _not_ going to use the sysconfig control mechanism to + dnl enable/disable pmcd, pmlogger, pmie, ... during the "rc" start + dnl and stop scripts + pcp_sysconfig_dir= + fi fi AC_SUBST(pcp_sysconfig_dir) dnl logs -if test -d /var/log -then - pcp_log_dir=/var/log/pcp -elif test -d /var/adm +if test ! -z "$PCP_LOG_DIR" then - pcp_log_dir=/var/adm/pcplog + pcp_log_dir=$PCP_LOG_DIR else - pcp_log_dir=$var_dir/pcplog + if test -d /var/log + then + pcp_log_dir=/var/log/pcp + elif test -d /var/adm + then + pcp_log_dir=/var/adm/pcplog + else + pcp_log_dir=$var_dir/pcplog + fi fi AC_SUBST(pcp_log_dir) diff -ru pcp-2.3.0/src/include/GNUmakefile pcp-2.3.0.nonroot/src/include/GNUmakefile --- pcp-2.3.0/src/include/GNUmakefile Thu Nov 21 19:17:55 2002 +++ pcp-2.3.0.nonroot/src/include/GNUmakefile Sun Dec 8 15:19:42 2002 @@ -51,8 +51,8 @@ install :: default_pcp install_pcp install_pcp : default_pcp - $(INSTALL) -m 755 -d /etc - $(INSTALL) -m 644 pcp.conf pcp.env /etc + $(INSTALL) -m 755 -d $(PCP_ETC_DIR)/etc + $(INSTALL) -m 644 pcp.conf pcp.env $(PCP_ETC_DIR)/etc $(INSTALL) -m 755 -d $(PCP_INC_DIR) $(INSTALL) -m 644 $(HFILES) $(GENERATED_HFILES) buildrules $(PCP_INC_DIR) $(INSTALL) -m 644 builddefs.install $(PCP_INC_DIR)/builddefs Only in pcp-2.3.0.nonroot/src/include: builddefs Only in pcp-2.3.0.nonroot/src/include: pcp.conf diff -ru pcp-2.3.0/src/include/pcp.conf.in pcp-2.3.0.nonroot/src/include/pcp.conf.in --- pcp-2.3.0/src/include/pcp.conf.in Thu Nov 21 19:17:57 2002 +++ pcp-2.3.0.nonroot/src/include/pcp.conf.in Sun Dec 8 15:47:35 2002 @@ -28,6 +28,10 @@ # Standard path: /etc/rc.d/init.d (Redhat-specific) PCP_RC_DIR=@pcp_rc_dir@ +# directory for pcp.conf +# Standard path: /etc/ +PCP_ETC_DIR=@pcp_etc_dir@ + # directory for sysconfig controls # Standard path: /etc/sysconf (Redhat-specific) # if no sysconfig support Only in pcp-2.3.0/src/pmdas/roomtemp: domain.h Only in pcp-2.3.0/src/pmdas/shping: domain.h Only in pcp-2.3.0/src/pmdas/simple: domain.h Only in pcp-2.3.0/src/pmdas/trace: pmtrace.c Only in pcp-2.3.0/src/pmdas/trivial: domain.h