-
Notifications
You must be signed in to change notification settings - Fork 692
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
See also: stlink-org/stlink#970
- Loading branch information
Showing
3 changed files
with
55 additions
and
4 deletions.
There are no files selected for viewing
24 changes: 24 additions & 0 deletions
24
community/stlink/0001-doc-man-Fix-installation-directory.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
From 2016590502558caa98c21abad2ce83c5f4804a98 Mon Sep 17 00:00:00 2001 | ||
From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net> | ||
Date: Mon, 1 Jun 2020 00:20:26 +0200 | ||
Subject: [PATCH] doc/man: Fix installation directory | ||
|
||
On Unix-like operating systems man pages are commonly installed to | ||
`/usr/share/man` not `/usr/share/stlink/man`. | ||
--- | ||
doc/man/CMakeLists.txt | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/doc/man/CMakeLists.txt b/doc/man/CMakeLists.txt | ||
index 23da9e1..9b3c507 100644 | ||
--- a/doc/man/CMakeLists.txt | ||
+++ b/doc/man/CMakeLists.txt | ||
@@ -30,7 +30,7 @@ foreach (manpage ${MANPAGES}) | ||
endif () | ||
|
||
if (f AND NOT WIN32) | ||
- install(FILES ${f} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/man/man1) | ||
+ install(FILES ${f} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/man/man1) | ||
unset(f) | ||
endif () | ||
endforeach () |
22 changes: 22 additions & 0 deletions
22
community/stlink/0002-CMakeLists.txt-Install-pkgconfig-files-again.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
From 59d0d1194d47f61db538eb6a1f451673355460a4 Mon Sep 17 00:00:00 2001 | ||
From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net> | ||
Date: Mon, 1 Jun 2020 00:27:18 +0200 | ||
Subject: [PATCH] CMakeLists.txt: Install pkgconfig files again | ||
|
||
--- | ||
CMakeLists.txt | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index 8628277..60f9087 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -49,7 +49,7 @@ find_package(libusb REQUIRED) | ||
|
||
## Package configuration (pkg-config) on unix-based systems | ||
if (NOT WIN32 AND NOT CMAKE_CROSSCOMPILING) | ||
- #add_subdirectory(cmake/pkgconfig) | ||
+ add_subdirectory(cmake/pkgconfig) | ||
find_package(PkgConfig) | ||
pkg_check_modules(GTK3 gtk+-3.0) | ||
endif () |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters