Browse Source

Add `make install` support for `linux` platform

At the moment, `qmake` generates a Makefile with an empty instruction for
install: due to the fact that `INSTALLS` and `TARGET.{path,files}` were
empty. Now Makefile can perform `make install` / `make uninstall` and
install/delete the executable file, desktop file and icons.

This commit implements this feature only for `linux` platform, but it
can be extended to other unix platforms if desired.

According to the commit history, icons are not used directly anywhere,
not used by flatpack, so moving should not break anything, but it was
necessary to install icons in the correct location on the `linux`
platform.
pull/56/head
PRESFIL 3 years ago
parent
commit
7cdc80777a
  1. 0
      contrib/icons/128x128/apps/website.i2pd.i2pd.png
  2. 0
      contrib/icons/16x16/apps/website.i2pd.i2pd.png
  3. 0
      contrib/icons/22x22/apps/website.i2pd.i2pd.png
  4. 0
      contrib/icons/24x24/apps/website.i2pd.i2pd.png
  5. 0
      contrib/icons/256x256/apps/website.i2pd.i2pd.png
  6. 0
      contrib/icons/32x32/apps/website.i2pd.i2pd.png
  7. 0
      contrib/icons/48x48/apps/website.i2pd.i2pd.png
  8. 0
      contrib/icons/512x512/apps/website.i2pd.i2pd.png
  9. 0
      contrib/icons/64x64/apps/website.i2pd.i2pd.png
  10. 13
      i2pd_qt.pro

0
contrib/icons/128x128/website.i2pd.i2pd.png → contrib/icons/128x128/apps/website.i2pd.i2pd.png

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

0
contrib/icons/16x16/website.i2pd.i2pd.png → contrib/icons/16x16/apps/website.i2pd.i2pd.png

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

0
contrib/icons/22x22/website.i2pd.i2pd.png → contrib/icons/22x22/apps/website.i2pd.i2pd.png

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

0
contrib/icons/24x24/website.i2pd.i2pd.png → contrib/icons/24x24/apps/website.i2pd.i2pd.png

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

0
contrib/icons/256x256/website.i2pd.i2pd.png → contrib/icons/256x256/apps/website.i2pd.i2pd.png

Before

Width:  |  Height:  |  Size: 53 KiB

After

Width:  |  Height:  |  Size: 53 KiB

0
contrib/icons/32x32/website.i2pd.i2pd.png → contrib/icons/32x32/apps/website.i2pd.i2pd.png

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

0
contrib/icons/48x48/website.i2pd.i2pd.png → contrib/icons/48x48/apps/website.i2pd.i2pd.png

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

0
contrib/icons/512x512/website.i2pd.i2pd.png → contrib/icons/512x512/apps/website.i2pd.i2pd.png

Before

Width:  |  Height:  |  Size: 168 KiB

After

Width:  |  Height:  |  Size: 168 KiB

0
contrib/icons/64x64/website.i2pd.i2pd.png → contrib/icons/64x64/apps/website.i2pd.i2pd.png

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB

13
i2pd_qt.pro

@ -3,6 +3,15 @@ QT += core gui
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TARGET = i2pd_qt TARGET = i2pd_qt
TARGET.files = i2pd_qt
linux:TARGET.path = /usr/bin/
desktop.files = contrib/website.i2pd.i2pd.desktop
linux:desktop.path = /usr/share/applications/
icons.files = contrib/icons/*
linux:icons.path = /usr/share/icons/hicolor/
TEMPLATE = app TEMPLATE = app
QMAKE_CXXFLAGS *= -Wno-unused-parameter -Wno-maybe-uninitialized -Wno-deprecated-copy QMAKE_CXXFLAGS *= -Wno-unused-parameter -Wno-maybe-uninitialized -Wno-deprecated-copy
CONFIG += strict_c++ c++11 CONFIG += strict_c++ c++11
@ -143,6 +152,10 @@ macx {
linux:!android { linux:!android {
message("Using Linux settings") message("Using Linux settings")
LIBS += -lcrypto -lssl -lboost_system -lboost_date_time -lboost_filesystem -lboost_program_options -lpthread -lminiupnpc LIBS += -lcrypto -lssl -lboost_system -lboost_date_time -lboost_filesystem -lboost_program_options -lpthread -lminiupnpc
INSTALLS += TARGET
INSTALLS += icons
INSTALLS += desktop
} }
windows { windows {

Loading…
Cancel
Save