Remove patches merged upstream
Sébastien Delafond
4 years ago
| 0 | From: =?utf-8?q?S=C3=A9bastien_Delafond?= <sdelafond@gmail.com> | |
| 1 | Date: Mon, 19 Nov 2018 16:48:11 +0100 | |
| 2 | Subject: Install under DESTDIR/ | |
| 3 | ||
| 4 | --- | |
| 5 | build/CMakeLists.txt | 16 ++++++++-------- | |
| 6 | 1 file changed, 8 insertions(+), 8 deletions(-) | |
| 7 | ||
| 8 | diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt | |
| 9 | index f8c3fe6..333d636 100644 | |
| 10 | --- a/build/CMakeLists.txt | |
| 11 | +++ b/build/CMakeLists.txt | |
| 12 | @@ -788,23 +788,23 @@ if (CREATE_FILES) | |
| 13 | install(CODE " | |
| 14 | function(mkdir_chown user group path) | |
| 15 | if (APPLE OR (UNIX AND NOT CYGWIN)) | |
| 16 | - if (NOT EXISTS \"\${path}\") | |
| 17 | - file(MAKE_DIRECTORY \"\${path}\") | |
| 18 | - execute_process(COMMAND \"chown\" \"\${user}:\${group}\" \"\${path}\") | |
| 19 | + if (NOT EXISTS \"\$ENV{DESTDIR}\${path}\") | |
| 20 | + file(MAKE_DIRECTORY \"\$ENV{DESTDIR}\${path}\") | |
| 21 | + execute_process(COMMAND \"chown\" \"\${user}:\${group}\" \"\$ENV{DESTDIR}\${path}\") | |
| 22 | endif () | |
| 23 | else() | |
| 24 | - file(MAKE_DIRECTORY \"\${path}\") | |
| 25 | + file(MAKE_DIRECTORY \"\$ENV{DESTDIR}\${path}\") | |
| 26 | endif () | |
| 27 | endfunction() | |
| 28 | ||
| 29 | function(touch_chown user group file) | |
| 30 | if (APPLE OR (UNIX AND NOT CYGWIN)) | |
| 31 | - if (NOT EXISTS \"\${file}\") | |
| 32 | - file(WRITE \"\${file}\" \"\") | |
| 33 | - execute_process(COMMAND \"chown\" \"\${user}:\${group}\" \"\${file}\") | |
| 34 | + if (NOT EXISTS \"\$ENV{DESTDIR}\${file}\") | |
| 35 | + file(WRITE \"\$ENV{DESTDIR}\${file}\" \"\") | |
| 36 | + execute_process(COMMAND \"chown\" \"\${user}:\${group}\" \"\$ENV{DESTDIR}\${file}\") | |
| 37 | endif () | |
| 38 | else() | |
| 39 | - file(WRITE \"{file}\" \"\") | |
| 40 | + file(WRITE \"\$ENV{DESTDIR}\${file}\" \"\") | |
| 41 | endif () | |
| 42 | endfunction() | |
| 43 |