diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2019-10-06 13:28:50 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2019-10-06 13:30:47 +0200 |
| commit | a4145721a74d52304d23631656ddac2deacc5759 (patch) | |
| tree | 7804bb2dfc9a1194b66b2044809244c80bf16d04 /src | |
| parent | be6c81787368959b463fc76da1ece77ca522f0fb (diff) | |
| download | VeraCrypt-a4145721a74d52304d23631656ddac2deacc5759.tar.gz VeraCrypt-a4145721a74d52304d23631656ddac2deacc5759.zip | |
Linux/FreeBSD: change location of documentation from /usr/share/veracrypt/doc to the standard /usr/share/doc/veracrypt
Diffstat (limited to 'src')
| -rwxr-xr-x | src/Main/GraphicUserInterface.cpp | 2 | ||||
| -rwxr-xr-x | src/Main/Main.make | 6 | ||||
| -rw-r--r-- | src/Setup/FreeBSD/veracrypt-uninstall.sh | 1 | ||||
| -rw-r--r-- | src/Setup/Linux/veracrypt-uninstall.sh | 1 |
4 files changed, 6 insertions, 4 deletions
diff --git a/src/Main/GraphicUserInterface.cpp b/src/Main/GraphicUserInterface.cpp index 99b2caad..b7b4cf45 100755 --- a/src/Main/GraphicUserInterface.cpp +++ b/src/Main/GraphicUserInterface.cpp @@ -1309,7 +1309,7 @@ namespace VeraCrypt #elif defined (TC_MACOSX) htmlPath += L"/../Resources/doc/HTML/"; #elif defined (TC_UNIX) - htmlPath = L"/usr/share/veracrypt/doc/HTML/"; + htmlPath = L"/usr/share/doc/veracrypt/HTML/"; #else localFile = false; #endif diff --git a/src/Main/Main.make b/src/Main/Main.make index bc54a67b..0bdd951d 100755 --- a/src/Main/Main.make +++ b/src/Main/Main.make @@ -286,12 +286,12 @@ ifeq "$(PLATFORM)" "FreeBSD" prepare: $(APPNAME) rm -fr $(BASE_DIR)/Setup/FreeBSD/usr mkdir -p $(BASE_DIR)/Setup/FreeBSD/usr/bin - mkdir -p $(BASE_DIR)/Setup/FreeBSD/usr/share/$(APPNAME)/doc/HTML + mkdir -p $(BASE_DIR)/Setup/FreeBSD/usr/share/doc/$(APPNAME)/HTML cp $(BASE_DIR)/Main/$(APPNAME) $(BASE_DIR)/Setup/FreeBSD/usr/bin/$(APPNAME) cp $(BASE_DIR)/Setup/Linux/$(APPNAME)-uninstall.sh $(BASE_DIR)/Setup/FreeBSD/usr/bin/$(APPNAME)-uninstall.sh chmod +x $(BASE_DIR)/Setup/FreeBSD/usr/bin/$(APPNAME)-uninstall.sh - cp $(BASE_DIR)/License.txt $(BASE_DIR)/Setup/FreeBSD/usr/share/$(APPNAME)/doc/License.txt - cp $(BASE_DIR)/../doc/html/* "$(BASE_DIR)/Setup/FreeBSD/usr/share/$(APPNAME)/doc/HTML" + cp $(BASE_DIR)/License.txt $(BASE_DIR)/Setup/FreeBSD/usr/share/doc/$(APPNAME)/License.txt + cp $(BASE_DIR)/../doc/html/* "$(BASE_DIR)/Setup/FreeBSD/usr/share/doc/$(APPNAME)/HTML" ifndef TC_NO_GUI mkdir -p $(BASE_DIR)/Setup/FreeBSD/usr/share/applications diff --git a/src/Setup/FreeBSD/veracrypt-uninstall.sh b/src/Setup/FreeBSD/veracrypt-uninstall.sh index f8f111e2..e29dbccc 100644 --- a/src/Setup/FreeBSD/veracrypt-uninstall.sh +++ b/src/Setup/FreeBSD/veracrypt-uninstall.sh @@ -6,6 +6,7 @@ rm -f /usr/bin/veracrypt rm -f /usr/share/applications/veracrypt.desktop rm -f /usr/share/pixmaps/veracrypt.xpm rm -fr /usr/share/veracrypt +rm -fr /usr/share/doc/veracrypt echo VeraCrypt uninstalled. rm -f /usr/bin/veracrypt-uninstall.sh diff --git a/src/Setup/Linux/veracrypt-uninstall.sh b/src/Setup/Linux/veracrypt-uninstall.sh index f8f111e2..e29dbccc 100644 --- a/src/Setup/Linux/veracrypt-uninstall.sh +++ b/src/Setup/Linux/veracrypt-uninstall.sh @@ -6,6 +6,7 @@ rm -f /usr/bin/veracrypt rm -f /usr/share/applications/veracrypt.desktop rm -f /usr/share/pixmaps/veracrypt.xpm rm -fr /usr/share/veracrypt +rm -fr /usr/share/doc/veracrypt echo VeraCrypt uninstalled. rm -f /usr/bin/veracrypt-uninstall.sh |