Index: ossp-pkg/rc/Makefile.in RCS File: /v/ossp/cvs/ossp-pkg/rc/Makefile.in,v rcsdiff -q -kk '-r1.13' '-r1.14' -u '/v/ossp/cvs/ossp-pkg/rc/Makefile.in,v' 2>/dev/null --- Makefile.in 2002/02/08 18:35:03 1.13 +++ Makefile.in 2002/02/12 17:59:50 1.14 @@ -46,6 +46,7 @@ LIBS = @LIBS@ RM = rm -f +STRIP = strip CHMOD = chmod RMDIR = rmdir SHTOOL = ./shtool @@ -101,8 +102,8 @@ $(RM) rc_pcre.gen $(PROG_NAME): $(OBJS) -# $(LIBTOOL) --mode=link --quiet $(CC) $(LDFLAGS) -o $(PROG_NAME) $(OBJS) $(LIBS) - $(CC) $(LDFLAGS) -o $(PROG_NAME) $(OBJS) $(LIBS) +# $(LIBTOOL) --mode=link --quiet $(CC) $(LDFLAGS) -o $@ $+ $(LIBS) + $(CC) $(LDFLAGS) -o $@ $+ $(LIBS) rc.1: rc.pod VS=`$(SHTOOL) version -lc -dshort rc_version.c`; \ @@ -118,7 +119,7 @@ --release="$$VS" --date="$$VL" \ rc-sample.pod >rc-sample.5 -install: all +install: $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(prefix) $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir) $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man1 @@ -147,3 +148,5 @@ test: rc $(CHMOD) 755 rc_test.sh > /dev/null 2>&1 ./rc_test.sh + +.PHONY: install uninstall clean distclean realclean check test Index: ossp-pkg/rc/configure.in RCS File: /v/ossp/cvs/ossp-pkg/rc/configure.in,v rcsdiff -q -kk '-r1.13' '-r1.14' -u '/v/ossp/cvs/ossp-pkg/rc/configure.in,v' 2>/dev/null --- configure.in 2002/02/08 18:35:03 1.13 +++ configure.in 2002/02/12 17:59:50 1.14 @@ -93,7 +93,7 @@ AC_SUBST(SUBDIR_EX) dnl Check for OSSP str library -AC_CHECK_EXTLIB([OSSP Str], +AC_CHECK_EXTLIB([OSSP str], str, str_parse, str.h, [SUBDIR_STR=""], [SUBDIR_STR="rc_str" @@ -104,7 +104,7 @@ AC_SUBST(SUBDIR_STR) dnl Check for OSSP var library -AC_CHECK_EXTLIB([OSSP Var], +AC_CHECK_EXTLIB([OSSP var], var, var_expand, var.h, [SUBDIR_VAR=""], [SUBDIR_VAR="rc_var" @@ -115,7 +115,7 @@ AC_SUBST(SUBDIR_VAR) dnl Check for OSSP val library -AC_CHECK_EXTLIB([OSSP Val], +AC_CHECK_EXTLIB([OSSP val], val, val_expand, val.h, [SUBDIR_VAL=""], [SUBDIR_VAL="rc_val" Index: ossp-pkg/rc/rc-sample.pod RCS File: /v/ossp/cvs/ossp-pkg/rc/rc-sample.pod,v rcsdiff -q -kk '-r1.8' '-r1.9' -u '/v/ossp/cvs/ossp-pkg/rc/rc-sample.pod,v' 2>/dev/null --- rc-sample.pod 2002/02/04 22:35:20 1.8 +++ rc-sample.pod 2002/02/12 17:59:50 1.9 @@ -122,7 +122,7 @@ This is the example runcommand script of an B package C. It is installed by package C and used read-only. - #!/cw/etc/rc + #! /cw/etc/rc %config foo_enable=yes foo_flags="" Index: ossp-pkg/rc/rc.example RCS File: /v/ossp/cvs/ossp-pkg/rc/rc.example,v rcsdiff -q -kk '-r1.7' '-r1.8' -u '/v/ossp/cvs/ossp-pkg/rc/rc.example,v' 2>/dev/null --- rc.example 2002/02/04 22:35:20 1.7 +++ rc.example 2002/02/12 17:59:50 1.8 @@ -50,7 +50,8 @@ %go -u root @start # A section with just one reference is an alias -%error # We have a rc (not user-level) error +%error # We have a rc error + logger -p local0.notice "OSSP rc error" # Very rough representation of built-in rc language +logit DAEMON CRITICAL; +outconsole ${rc_errstring}; # rc_errcode is also available @@ -99,7 +100,8 @@ !doit -u root &run # A section with just one reference is an alias -!problem # We have a rc (not user-level) error +!problem # We have a rc error + logger -p local0.notice "OSSP rc error" # Very rough representation of built-in rc language +logit DAEMON CRITICAL; +outconsole ${rc_errstring}; # rc_errcode is also available @@ -156,7 +158,8 @@ # A section with just one reference is an alias - # We have a rc (not user-level) error + # We have a rc error + logger -p local0.notice "OSSP rc error" # Very rough representation of built-in rc language +logit DAEMON CRITICAL; +outconsole ${rc_errstring}; # rc_errcode is also available @@ -240,9 +243,10 @@ start REFER # A section with just one reference is an alias END -error ERROR # We have a rc (not user-level) error -# Very rough representation of built-in rc language +error ERROR # We have a rc error BEGIN + logger -p local0.notice "OSSP rc error" + # Very rough representation of built-in rc language +logit DAEMON CRITICAL; +outconsole ${rc_errstring}; # rc_errcode is also available +outconsole "Runcommand-level error in line ";