Merge commit 'stark/master'

diff --combined Makefile
index 73fdcc3cc5cb96b7266a1273fcf6ce615bad6eba,44011bd517d3528c85a8d58c555d474f5f03c95d..cbffcb7bd661cba698dee1274e725efaeb8f5825
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -78,11 -78,6 +78,11 @@@ ifeq ($(uname_s),NetBSD
        LDFLAGS += -Wl,-soname,$(soname)
  endif
  
 +ifeq ($(uname_s),FreeBSD)
 +      format := elf
 +      LDFLAGS += -Wl,-soname,$(soname)
 +endif
 +
  ifeq ($(format),elf)
        # On ELf-based systems, the following conventions apply (see dhweeler's
        # Program Library HOWTO):
@@@ -150,7 -145,8 +150,8 @@@ errtab.h: errlis
  osl.h: osl.h.in osl_errors.h Makefile
        cat osl.h.in osl_errors.h > $@
  clean:
-       rm -f *.o $(realname) osl.h osl_errors.h errtab.h fsck.cmdline.h fsck.cmdline.c
+       rm -f *.o $(realname) osl.h osl_errors.h errtab.h fsck.cmdline.h \
+               fsck.cmdline.c oslfsck
  
  install: all
        $(MKDIR) $(libdir) $(includedir)