Skip to content

Commit bdf8c83

Browse files
committed
Fix Up #2659; Build libzstd.pc Whenever Building the Lib on Unix
1 parent 9118ee0 commit bdf8c83

File tree

1 file changed

+13
-14
lines changed

1 file changed

+13
-14
lines changed

lib/Makefile

+13-14
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ endif # if windows
175175
libzstd : $(LIBZSTD)
176176

177177
.PHONY: lib
178-
lib : libzstd.a libzstd libzstd.pc
178+
lib : libzstd.a libzstd
179179

180180

181181
# note : do not define lib-mt or lib-release as .PHONY
@@ -246,24 +246,12 @@ clean:
246246
$(RM) -r obj/*
247247
@echo Cleaning library completed
248248

249-
libzstd.pc:
250-
libzstd.pc: libzstd.pc.in
251-
@echo creating pkgconfig
252-
@sed $(SED_ERE_OPT) \
253-
-e 's|@PREFIX@|$(PREFIX)|' \
254-
-e 's|@EXEC_PREFIX@|$(PCEXEC_PREFIX)|' \
255-
-e 's|@INCLUDEDIR@|$(PCINCPREFIX)$(PCINCDIR)|' \
256-
-e 's|@LIBDIR@|$(PCLIBPREFIX)$(PCLIBDIR)|' \
257-
-e 's|@VERSION@|$(VERSION)|' \
258-
-e 's|@LIBS_PRIVATE@|$(LDFLAGS_DYNLIB)|' \
259-
$< >$@
260-
261249
#-----------------------------------------------------------------------------
262250
# make install is validated only for below listed environments
263251
#-----------------------------------------------------------------------------
264252
ifneq (,$(filter $(UNAME),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku AIX))
265253

266-
all: libzstd.pc
254+
lib: libzstd.pc
267255

268256
HAS_EXPLICIT_EXEC_PREFIX := $(if $(or $(EXEC_PREFIX),$(exec_prefix)),1,)
269257

@@ -308,6 +296,17 @@ INSTALL_PROGRAM ?= $(INSTALL)
308296
INSTALL_DATA ?= $(INSTALL) -m 644
309297

310298

299+
libzstd.pc: libzstd.pc.in
300+
@echo creating pkgconfig
301+
@sed $(SED_ERE_OPT) \
302+
-e 's|@PREFIX@|$(PREFIX)|' \
303+
-e 's|@EXEC_PREFIX@|$(PCEXEC_PREFIX)|' \
304+
-e 's|@INCLUDEDIR@|$(PCINCPREFIX)$(PCINCDIR)|' \
305+
-e 's|@LIBDIR@|$(PCLIBPREFIX)$(PCLIBDIR)|' \
306+
-e 's|@VERSION@|$(VERSION)|' \
307+
-e 's|@LIBS_PRIVATE@|$(LDFLAGS_DYNLIB)|' \
308+
$< >$@
309+
311310
.PHONY: install
312311
install: install-pc install-static install-shared install-includes
313312
@echo zstd static and shared library installed

0 commit comments

Comments
 (0)