$OpenBSD: patch-build_makefiles_Makefile_top,v 1.1.1.1 2010/06/29 20:11:13 landry Exp $ --- build/makefiles/Makefile.top.orig Fri Jun 25 18:53:05 2010 +++ build/makefiles/Makefile.top Fri Jun 25 18:54:01 2010 @@ -94,8 +94,8 @@ endif # Makefile variables ############################################################################## -Q ?= @ -VQ ?= @ +Q ?= +VQ ?= ############################################################################## # Exported variables (also OUTPUT, further down) @@ -188,8 +188,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).$(LIBhubbub_VERSION) + OUTPUT := $(BUILDDIR)/$(SHAREDLIBNAME).$(LIBhubbub_VERSION) else OUTPUT := $(BUILDDIR)/lib$(COMPONENT)$(LIBEXT) endif @@ -204,14 +204,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) @@ -272,7 +264,7 @@ __required = $(if $(REQUIRED_PKGS), \ # Install a pkg-config control file ($1) to the specified location ($2) define install_pkgconfig $(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)#' \ @@ -287,8 +279,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)