Index: ossp-pkg/rc/rc_config.c RCS File: /v/ossp/cvs/ossp-pkg/rc/rc_config.c,v rcsdiff -q -kk '-r1.40' '-r1.41' -u '/v/ossp/cvs/ossp-pkg/rc/rc_config.c,v' 2>/dev/null --- rc_config.c 2003/07/11 09:18:20 1.40 +++ rc_config.c 2003/07/11 09:38:29 1.41 @@ -29,11 +29,16 @@ #include #include -#include /* For opendir(3) */ +#include /* For opendir(3) */ #include "rc.h" #include "rc_config.h" -#include "rc_const.h" /* String constants */ +#include "rc_const.h" /* String constants */ + +/* Cludge the version id */ +#define _RC_VERSION_C_AS_HEADER_ +#include "rc_version.c" +#undef _RC_VERSION_C_AS_HEADER_ static int m_nLocks = 0; /* Server locks, not thread-safe FIXME */ @@ -264,7 +269,7 @@ bStop = TRUE; } else if (configGetval(RC_VER_VAL)) { - fprintf(stdout, "OSSP rc %s\n", RC_VERSION); + fprintf(stdout, "OSSP rc %s\n", rc_version.v_short); bStop = TRUE; } } Index: ossp-pkg/rc/rc_private.h RCS File: /v/ossp/cvs/ossp-pkg/rc/rc_private.h,v rcsdiff -q -kk '-r1.37' '-r1.38' -u '/v/ossp/cvs/ossp-pkg/rc/rc_private.h,v' 2>/dev/null --- rc_private.h 2003/07/07 13:30:51 1.37 +++ rc_private.h 2003/07/11 09:38:29 1.38 @@ -45,10 +45,7 @@ #define TRACEL(num) fprintf(stderr, "%s:%d: %ld\n", __FILE__, __LINE__, (long int)num) #endif - -/* FIXME Tie to shtool generation */ -#define RC_VERSION "77.77" - +/* Pointer and string manipulation constants */ #define RC_SEC_SUB 1 #define RC_GOOD_MEASURE 8 #define RC_EXEC_MAXARGS 8