25 lines
1009 B
Plaintext
25 lines
1009 B
Plaintext
$OpenBSD: patch-subdir_mak,v 1.5 2012/04/28 08:41:32 ajacoutot Exp $
|
|
--- subdir.mak.orig Sat Apr 21 23:53:40 2012
|
|
+++ subdir.mak Sun Apr 22 00:47:52 2012
|
|
@@ -41,7 +41,7 @@ $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)
|
|
|
|
$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SUBDIR)lib$(NAME).ver
|
|
$(SLIB_CREATE_DEF_CMD)
|
|
- $$(LD) $(SHFLAGS) $(FFLDFLAGS) -o $$@ $$(filter %.o,$$^) $(FFEXTRALIBS) $(EXTRAOBJS)
|
|
+ $$(LD) $(SHFLAGS) $(FFLDFLAGS) -o $$@ $$(filter %.o,$$^) $(LIB$(NAME)_EXTRALIBS) $(EXTRAOBJS)
|
|
$(SLIB_EXTRA_CMD)
|
|
|
|
ifdef SUBDIR
|
|
@@ -60,11 +60,6 @@ distclean:: clean
|
|
install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME)
|
|
$(Q)mkdir -p "$(SHLIBDIR)"
|
|
$$(INSTALL) -m 755 $$< "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
|
|
- $$(STRIP) "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
|
|
- $(Q)cd "$(SHLIBDIR)" && \
|
|
- $(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
|
|
- $(Q)cd "$(SHLIBDIR)" && \
|
|
- $(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME)
|
|
$(SLIB_INSTALL_EXTRA_CMD)
|
|
|
|
install-lib$(NAME)-static: $(SUBDIR)$(LIBNAME)
|