diff options
author | Maxim Cournoyer <[email protected]> | 2023-04-13 13:45:35 -0400 |
---|---|---|
committer | Maxim Cournoyer <[email protected]> | 2023-04-13 13:45:35 -0400 |
commit | c02257b6d1bade6efa528271b55bf8d8ab7b0296 (patch) | |
tree | 616bad69b4bacba24c5105336bc282626fcbd114 /gnu/packages/patches/orangeduck-mpc-fix-pkg-config.patch | |
parent | c371555a4b46a5c9288f54753b0f158f9c4b8abc (diff) | |
parent | 0fe2c78cac19acfb46c3bc365075293e51e0e5aa (diff) |
Merge staging branch.
Conflicts resolved in:
gnu/packages/engineering.scm
gnu/packages/gnuzilla.scm
gnu/packages/photo.scm
Diffstat (limited to 'gnu/packages/patches/orangeduck-mpc-fix-pkg-config.patch')
-rw-r--r-- | gnu/packages/patches/orangeduck-mpc-fix-pkg-config.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/gnu/packages/patches/orangeduck-mpc-fix-pkg-config.patch b/gnu/packages/patches/orangeduck-mpc-fix-pkg-config.patch new file mode 100644 index 0000000000..f6155517d1 --- /dev/null +++ b/gnu/packages/patches/orangeduck-mpc-fix-pkg-config.patch @@ -0,0 +1,25 @@ +Upstream status: https://github.com/orangeduck/mpc/pull/160 + +diff --git a/Makefile b/Makefile +index 7719acc..fe798c5 100644 +--- a/Makefile ++++ b/Makefile +@@ -15,7 +15,7 @@ EXAMPLESEXE = $(EXAMPLES:.c=) +
+ .PHONY: all check clean libs $(DIST)/$(PROJ).pc
+
+-all: $(EXAMPLESEXE) check
++all: $(EXAMPLESEXE) check libs $(DIST)/$(PROJ).pc
+
+ $(DIST):
+ $(MKDIR) $(DIST)
+@@ -65,7 +65,8 @@ install: all + install -m755 -t $(DESTDIR)$(PREFIX)/lib $(DIST)/lib*
+ install -m644 -t $(DESTDIR)$(PREFIX)/share/$(PROJ) $(PROJ).c $(PROJ).h
+ install -m644 $(PROJ).h $(DESTDIR)$(PREFIX)/include/$(PROJ).h
+- install -m644 $(PROJ).pc $(DESTDIR)$(PREFIX)/lib/pkgconfig/$(PROJ).pc
++ install -m644 $(DIST)/$(PROJ).pc \
++ $(DESTDIR)$(PREFIX)/lib/pkgconfig/$(PROJ).pc
+
+ uninstall:
+ rm -rf -- \
|