libss: handle memory allcation failure in ss_help()

[tools/e2fsprogs.git] / lib / Makefile.solaris-lib

diff --git a/lib/Makefile.solaris-lib b/lib/Makefile.solaris-lib
index 66f2b4c..1e63636 100644 (file)
--- a/lib/Makefile.solaris-lib
+++ b/lib/Makefile.solaris-lib
@@ -24,8 +24,9 @@ image:                $(ELF_LIB)
 
 $(ELF_LIB): $(OBJS)
        $(E) "  GEN_ELF_SOLIB $(ELF_LIB)"
-       $(Q) (cd elfshared; $(CC) --shared -o $(ELF_LIB) $(ELF_OTHER_LIBS) \
-               $(LDFLAGS) -Wl,-h,$(ELF_SONAME) $(OBJS))
+       $(Q) (cd elfshared; $(CC) --shared -o $(ELF_LIB) \
+               -L$(top_builddir)/../lib $(LDFLAGS_SHLIB) \
+               -Wl,-h,$(ELF_SONAME) $(OBJS) $(ELF_OTHER_LIBS))
        $(Q) $(MV) elfshared/$(ELF_LIB) .
        $(Q) $(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME)
        $(Q) (cd ..; $(LN) $(LINK_BUILD_FLAGS) \
@@ -34,7 +35,7 @@ $(ELF_LIB): $(OBJS)
        $(Q) (cd ..; $(LN) $(LINK_BUILD_FLAGS) $(ELF_LIB) $(ELF_SONAME))
 
 installdirs-elf-lib::
-       $(MKINSTALLDIRS) $(DESTDIR)$(ELF_INSTALL_DIR) \
+       $(MKDIR_P) $(DESTDIR)$(ELF_INSTALL_DIR) \
                $(DESTDIR)$(libdir)
 
 installdirs:: installdirs-elf-lib
@@ -49,7 +50,7 @@ install-shlibs install:: $(ELF_LIB) installdirs-elf-lib
 install-strip: install
        $(STRIP) -x $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
 
-install-shlibs-strip: install-shlibs
+install-shlibs-strip:: install-shlibs
        $(STRIP) -x $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
 
 uninstall-shlibs uninstall::