Merge commit 'fml/master'

diff --combined Makefile
index 8116f1aba0194c43bc93614d5e47d055f03e086e,2f8f027929a1fb4010c65d3ef5ddfea302700093..a65ba2d9a4d3cc0147198e86f845455a925a7957
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -41,24 -41,25 +41,25 @@@ uname_s := $(shell uname -s 2>/dev/nul
  uname_rs := $(shell uname -rs)
  
  libname := osl
- ifeq ($(uname_s),Linux)
-       # On Linux, the following conventions apply (see dhweeler's Program
-       # Library HOWTO):
-       #
-       # The soname has the prefix ``lib'', the name of the library, the
-       # phrase ``.so'', followed by a period and a version number that is
-       # incremented whenever the interface changes.
-       soname := lib$(libname).so.$(x)
- 
-       # The real name adds to the soname a period, a minor number, another
-       # period, and the release number.
-       realname := $(soname).$(y).$(z)
- 
-       # In addition, there's the name that the compiler uses when requesting
-       # a library, (I'll call it the ``linker name''), which is simply the
-       # soname without any version number.
-       linkername := lib$(libname).so
  
+ # On ELf-based systems, the following conventions apply (see dhweeler's Program
+ # Library HOWTO):
+ #
+ # The soname has the prefix ``lib'', the name of the library, the
+ # phrase ``.so'', followed by a period and a version number that is
+ # incremented whenever the interface changes.
+ soname := lib$(libname).so.$(x)
+ 
+ # The real name adds to the soname a period, a minor number, another
+ # period, and the release number.
+ realname := $(soname).$(y).$(z)
+ 
+ # In addition, there's the name that the compiler uses when requesting
+ # a library, (I'll call it the ``linker name''), which is simply the
+ # soname without any version number.
+ linkername := lib$(libname).so
+ 
+ ifeq ($(uname_s),Linux)
        LDFLAGS += --shared
        LDFLAGS += -Wl,-soname,$(soname)
        # disallow undefined symbols
@@@ -66,7 -67,6 +67,6 @@@
  endif
  ifeq ($(uname_s),Darwin)
        # Darwin has its own idea on version numbers:
-       #
        realname := lib$(libname).$(x).dylib
        soname := $(realname)
        linkername := lib$(libname).so
@@@ -86,9 -86,6 +86,6 @@@ ifeq ($(uname_s),SunOS
        LDFLAGS += --shared
        LDFLAGS += -z text
        LDFLAGS += -z defs
-       soname := lib$(libname).so.$(x)
-       realname := $(soname).$(y).$(z)
-       linkername := lib$(libname).so
        CPPFLAGS += -I/opt/csw/include
        LDFLAGS += -lc
  endif
@@@ -103,7 -100,7 +100,7 @@@ osl.c fsck.c: errtab.
  fsck.cmdline.o: fsck.cmdline.c fsck.cmdline.h
        $(CC) -c -DVERSION='"$(VERSION)"' $<
  
 -%.fsck.o: %.c Makefile fsck.cmdline.c fsck.cmdline.h
 +%.fsck.o: %.c Makefile fsck.cmdline.c fsck.cmdline.h osl.h
        $(CC) -c -DVERSION='"$(VERSION)"' $(CPPFLAGS) $(CFLAGS) $< -o $@
  
  %.o: %.c Makefile