59 lines
2.1 KiB
Plaintext
59 lines
2.1 KiB
Plaintext
$OpenBSD: patch-build_makefiles_Makefile_top,v 1.2 2011/07/18 20:02:20 landry Exp $
|
|
--- build/makefiles/Makefile.top.orig Sun Mar 13 04:30:18 2011
|
|
+++ build/makefiles/Makefile.top Sun Jun 19 00:31:40 2011
|
|
@@ -92,8 +92,8 @@ endif
|
|
# Makefile variables
|
|
##############################################################################
|
|
|
|
-Q ?= @
|
|
-VQ ?= @
|
|
+Q ?=
|
|
+VQ ?=
|
|
|
|
##############################################################################
|
|
# Exported variables (also OUTPUT, further down)
|
|
@@ -185,8 +185,8 @@ endif
|
|
ifeq ($(findstring lib,$(COMPONENT_TYPE)),lib)
|
|
ifeq ($(findstring lib-shared,$(COMPONENT_TYPE)),lib-shared)
|
|
SHAREDLIBNAME := lib$(COMPONENT)$(LIBEXT)
|
|
- SONAME := $(SHAREDLIBNAME).$(major-version)
|
|
- OUTPUT := $(BUILDDIR)/$(SHAREDLIBNAME).$(COMPONENT_VERSION)
|
|
+ SONAME := $(SHAREDLIBNAME).$(LIBnsgif_VERSION)
|
|
+ OUTPUT := $(BUILDDIR)/$(SHAREDLIBNAME).$(LIBnsgif_VERSION)
|
|
else
|
|
OUTPUT := $(BUILDDIR)/lib$(COMPONENT)$(LIBEXT)
|
|
endif
|
|
@@ -201,14 +201,6 @@ endif
|
|
.PHONY: all test coverage profile docs clean distclean install uninstall \
|
|
__default __precov __partial_clean __postshared
|
|
|
|
-ifeq ($(COMPONENT_TYPE),lib-shared)
|
|
- POST_TARGETS := __postshared $(POST_TARGETS)
|
|
-
|
|
-__postshared:
|
|
- $(Q)$(LN) $(LNFLAGS) -f -s $(notdir $(OUTPUT)) $(BUILDDIR)/$(SONAME)
|
|
- $(Q)$(LN) $(LNFLAGS) -f -s $(notdir $(OUTPUT)) $(BUILDDIR)/$(SHAREDLIBNAME)
|
|
-endif
|
|
-
|
|
# Default target
|
|
all: $(PRE_TARGETS) $(OUTPUT) $(POST_TARGETS)
|
|
|
|
@@ -269,7 +261,7 @@ __required = $(if $(REQUIRED_PKGS),Requires: $(subst $
|
|
define install_pkgconfig
|
|
$(Q)$(ECHO) $(ECHOFLAGS) "sed -e... $1 >$(BUILDDIR)/$(1:.in=)"
|
|
$(Q)$(SED) \
|
|
- -e 's#PREFIX#$(PREFIX)#' \
|
|
+ -e 's#PREFIX#$(TRUEPREFIX)#' \
|
|
-e 's#MAJOR#$(major-version)#' \
|
|
-e 's#MINOR#$(minor-version)#' \
|
|
-e 's#PATCH#$(patch-version)#' \
|
|
@@ -284,8 +276,6 @@ endef
|
|
# TODO: Is this scheme portable?
|
|
define install_shared_lib
|
|
$(INSTALL) $(INSTALLFLAGS) -m 755 $1 $2/$(notdir $1)
|
|
- $(LN) $(LNFLAGS) -f -s $(notdir $1) $2/$(SONAME)
|
|
- $(LN) $(LNFLAGS) -f -s $(notdir $1) $2/$(SHAREDLIBNAME)
|
|
endef
|
|
|
|
# Install a file ($1) to the specified location ($2)
|