Skip to content

Allow changing installation prefix #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jhakonen wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allow changing installation prefix #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb59563
Allow configure of installation prefix
jhakonen May 4, 2025
d374d34
Add PREFIX to autogen.sh and README.md
jhakonen May 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@ to build and install libssh yourself (< 2 minutes!)
3. Run `make -j$(nproc)` to compile qjournalctl
4. Run `sudo make install`

Step 4 installs QJournalctl under `/usr`. If this is incorrect the path can be changed by defining
`PREFIX` environment variable before running `autogen.sh`, for example:

```bash
PREFIX=/usr/local ./autogen.sh
```


## QJournalctl for macOS
Expand Down
2 changes: 1 addition & 1 deletion autogen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ if [ "$(uname -s)" = "Darwin" ]; then
QMAKE_SPEC="macx-clang"
fi

QT_SELECT=qt5 $QMAKE_BIN qjournalctl.pro -r -spec $QMAKE_SPEC CONFIG+=release
QT_SELECT=qt5 $QMAKE_BIN qjournalctl.pro -r -spec $QMAKE_SPEC CONFIG+=release "PREFIX=\"$PREFIX\""

11 changes: 7 additions & 4 deletions qjournalctl.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ CONFIG += c++11
# qmake qjournalctl.pro CONFIG+=release CONFIG+=x86_64 VCPKG_FOLDER=%VCPKG_INSTALL_FOLDER%
!defined(VCPKG_FOLDER, var):VCPKG_FOLDER = $$_PRO_FILE_PWD_\vcpkg

# Use /usr as installation prefix if not provided
isEmpty(PREFIX):PREFIX = /usr

SOURCES += src/main.cpp\
src/connectiondialog.cpp \
src/connection.cpp \
Expand Down Expand Up @@ -64,14 +67,14 @@ RESOURCES += \
# This prevents qmake from failing when trying to install
# the desktop environment files
QMAKE_STRIP = echo
target.path = /usr/bin
target.path = $$PREFIX/bin

# Desktop environment files
desktop-file.path = /usr/share/applications
desktop-file.path = $$PREFIX/share/applications
desktop-file.files += ui/qjournalctl.desktop
desktop-icon.path = /usr/share/pixmaps
desktop-icon.path = $$PREFIX/share/pixmaps
desktop-icon.files += ui/qjournalctl.png
metainfo-file.path = /usr/share/metainfo
metainfo-file.path = $$PREFIX/share/metainfo
metainfo-file.files += qjournalctl.appdata.xml

INSTALLS += target desktop-file desktop-icon metainfo-file
Expand Down