diff options
| author | Thomas Bushnell <thomas@gnu.org> | 1996-09-05 16:59:37 +0000 |
|---|---|---|
| committer | Thomas Bushnell <thomas@gnu.org> | 1996-09-05 16:59:37 +0000 |
| commit | 5145728f45d1a83ebe229ee38c4f2534a43c385f (patch) | |
| tree | 48dfa16e2e256f1627e60d1f1d19dfcc9e6e46d2 /sutils | |
| parent | 41476b24b860bc333ed99c3eb2b575193b111aa7 (diff) | |
*** empty log message ***
Diffstat (limited to 'sutils')
| -rw-r--r-- | sutils/ChangeLog | 10 | ||||
| -rw-r--r-- | sutils/Makefile | 4 | ||||
| -rwxr-xr-x | sutils/e2os.sh | 2 | ||||
| -rw-r--r-- | sutils/fsck.c | 4 | ||||
| -rw-r--r-- | sutils/halt.c | 3 | ||||
| -rw-r--r-- | sutils/reboot.c | 3 |
6 files changed, 20 insertions, 6 deletions
diff --git a/sutils/ChangeLog b/sutils/ChangeLog index ce5e777a..2c5f1765 100644 --- a/sutils/ChangeLog +++ b/sutils/ChangeLog @@ -1,3 +1,13 @@ +Thu Sep 5 11:40:00 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> + + * Makefile: Use $(top_srcdir)/sh-version.sed to make executables + from .sh files. + + * fsck.c: Include <version.h>. + (argp_program_version): Define with STANDARD_HURD_VERSION. + * halt.c: Likewise. + * reboot.c: Likewise. + Tue Aug 27 12:06:55 1996 Miles Bader <miles@gnu.ai.mit.edu> * reboot.c, halt.c (main): Add argument parsing. diff --git a/sutils/Makefile b/sutils/Makefile index 823c69c3..e06ef317 100644 --- a/sutils/Makefile +++ b/sutils/Makefile @@ -34,7 +34,7 @@ include ../Makeconf fsck: fstab.o clookup.o reboot halt fsck: ../libshouldbeinlibc/libshouldbeinlibc.a -%: %.sh - cp $< $@ +%: %.sh $(top_srcdir)/sh-version.sed + sed -f $(top_srcdir)/sh-version.sed < $< > $@ $(filter-out $(special-targets), $(targets)): %: %.o diff --git a/sutils/e2os.sh b/sutils/e2os.sh index 644e9616..8d3628d0 100755 --- a/sutils/e2os.sh +++ b/sutils/e2os.sh @@ -41,7 +41,7 @@ while :; do echo "Usage: $0 [-V?] [--help] [--usage] [--version] DEVICE [OS]" exit 0;; --version|-V) - echo "e2os 1.0 (`uname -sr`)"; exit 0;; + echo "STANDARD_HURD_VERSION_e2os_"; exit 0;; -*) echo 1>&2 "$0: unrecognized option \`$1'" echo 1>&2 "Try \`$0 --help' for more information"; diff --git a/sutils/fsck.c b/sutils/fsck.c index 161c275d..b3165ace 100644 --- a/sutils/fsck.c +++ b/sutils/fsck.c @@ -51,10 +51,12 @@ #include <argp.h> #include <argz.h> #include <assert.h> +#include <version.h> #include "fstab.h" -char *argp_program_version = "fsck 1.0 (GNU " HURD_RELEASE ")"; +char *argp_program_version = STANDARD_HURD_VERSION (fsck); + /* for debugging */ static int _debug = 0; diff --git a/sutils/halt.c b/sutils/halt.c index 824934b9..9b6980fa 100644 --- a/sutils/halt.c +++ b/sutils/halt.c @@ -24,8 +24,9 @@ #include <stdio.h> #include <argp.h> #include <hurd.h> +#include <version.h> -char *argp_program_version = "halt 1.1 (GNU " HURD_RELEASE ")"; +char *argp_program_version = STANDARD_HURD_VERSION (halt); int main (int argc, char *argv[]) diff --git a/sutils/reboot.c b/sutils/reboot.c index 4d4269af..2b3d1130 100644 --- a/sutils/reboot.c +++ b/sutils/reboot.c @@ -24,8 +24,9 @@ #include <stdio.h> #include <argp.h> #include <hurd.h> +#include <version.h> -char *argp_program_version = "reboot 1.1 (GNU " HURD_RELEASE ")"; +char *argp_program_version = STANDARD_HURD_VERSION (reboot); int main (int argc, char *argv[]) |