fix(desktop): chage script install location

This commit is contained in:
Fabricio Godoi 2020-04-14 17:44:28 -03:00
parent 81473ad7b9
commit b5576ce567
4 changed files with 8 additions and 9 deletions

View File

@ -30,18 +30,24 @@ set (appdir "/usr/share")
set (appbin "/usr/bin")
add_custom_target(install_build
# echo "HERE: $(HOME)"
COMMAND mkdir -p $ENV{DESTDIR}${appdir}/${PROJECT_NAME}
COMMAND mkdir -p $ENV{DESTDIR}${appdir}/${PROJECT_NAME}/glade
COMMAND install -Dm755 ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME} $ENV{DESTDIR}${appdir}/${PROJECT_NAME}/${PROJECT_NAME}
COMMAND install -Dm755 ${CMAKE_CURRENT_BINARY_DIR}/glade/* $ENV{DESTDIR}${appdir}/${PROJECT_NAME}/glade/
COMMAND ln -rs $ENV{DESTDIR}${appdir}/${PROJECT_NAME}/${PROJECT_NAME} $ENV{DESTDIR}${appbin}/${PROJECT_NAME}
#COMMAND ${CMAKE_COMMAND} -E create_symlink $ENV{DESTDIR}${appdir}/${PROJECT_NAME}/${PROJECT_NAME} $ENV{DESTDIR}${appbin}/${PROJECT_NAME}
COMMAND echo $ENV{DESTDIR}
COMMAND install -Dm644 ${CMAKE_SOURCE_DIR}/desktop/hotspot.png $ENV{DESTDIR}${appdir}/${PROJECT_NAME}/hotspot.png
COMMAND install -Dm644 ${CMAKE_SOURCE_DIR}/desktop/wifihotspot.desktop $ENV{DESTDIR}${appdir}/${PROJECT_NAME}/${PROJECT_NAME}.desktop
COMMAND install -Dm644 ${CMAKE_SOURCE_DIR}/desktop/wifihotspot.desktop $ENV{DESTDIR}${appdir}/applications/${PROJECT_NAME}.desktop
DEPENDS ${PROJECT_NAME}
COMMENT Installing files...
)
add_custom_target(uninstall_build
COMMAND rm -r $ENV{DESTDIR}${appdir}/${PROJECT_NAME}
COMMAND rm -rf $ENV{DESTDIR}${appdir}/${PROJECT_NAME}
COMMAND rm -f $ENV{DESTDIR}${appbin}/${PROJECT_NAME}
COMMAND rm -f $ENV{DESTDIR}${appdir}/applications/${PROJECT_NAME}.desktop
COMMENT Unstalling files...
)

View File

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
Name=WifiHotspot
Icon=/usr/share/doc/create_ap/hotspot.png
Icon=/usr/share/wihotspot/hotspot.png
Exec=sh -c 'pkexec env DISPLAY=$DISPLAY XAUTHORITY=$XAUTHORITY sudo /usr/bin/wihotspot'
Terminal=false
Categories=System

View File

@ -7,15 +7,11 @@ all:
@echo "Run 'make uninstall' for uninstallation."
install:
# echo "HERE: $(HOME)"
install -Dm755 create_ap $(DESTDIR)$(BINDIR)/create_ap
install -Dm644 create_ap.conf $(DESTDIR)/etc/create_ap.conf
[ ! -d /lib/systemd/system ] || install -Dm644 create_ap.service $(DESTDIR)$(PREFIX)/lib/systemd/system/create_ap.service
install -Dm644 bash_completion $(DESTDIR)$(PREFIX)/share/bash-completion/completions/create_ap
install -Dm644 README.md $(DESTDIR)$(PREFIX)/share/doc/create_ap/README.md
install -Dm644 hotspot.png $(DESTDIR)$(PREFIX)/share/doc/create_ap/hotspot.png
install -Dm644 wifihotspot.desktop $(DESTDIR)$(PREFIX)/share/doc/create_ap/wifihotspot.desktop
install -Dm644 wifihotspot.desktop $(DESTDIR)$(PREFIX)/share/applications/wifihotspot.desktop
uninstall:
@ -24,6 +20,3 @@ uninstall:
[ ! -f /lib/systemd/system/create_ap.service ] || rm -f $(DESTDIR)$(PREFIX)/lib/systemd/system/create_ap.service
rm -f $(DESTDIR)$(PREFIX)/share/bash-completion/completions/create_ap
rm -f $(DESTDIR)$(PREFIX)/share/doc/create_ap/README.md
rm -f $(DESTDIR)$(PREFIX)/share/doc/create_ap/hotspot.png
rm -f $(DESTDIR)$(PREFIX)/share/doc/create_ap/wifihotspot.desktop
rm -f $(DESTDIR)$(PREFIX)/share/applications/wifihotspot.desktop