From c0377457df863c6817fc6ac0bf6eb226f0d3d1e9 Mon Sep 17 00:00:00 2001 From: vaxerski <43317083+vaxerski@users.noreply.github.com> Date: Fri, 15 Jul 2022 11:39:11 +0200 Subject: [PATCH] don't poison wlr in make install --- Makefile | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index b1a5575a..99ac1324 100644 --- a/Makefile +++ b/Makefile @@ -107,11 +107,13 @@ all: cd ./hyprctl && make all && cd .. install: - [ ! -d /usr/include/wlr ] || mv /usr/include/wlr /usr/include/wlrBackup - [ ! -f /usr/lib/libwlroots.so ] || mv /usr/lib/libwlroots.so /usr/lib/libwlroots.so.backup - [ ! -f /usr/lib/pkgconfig/wlroots.pc ] || mv /usr/lib/pkgconfig/wlroots.pc /usr/lib/pkgconfig/wlroots.pc.backup + make clear + make fixwlr + cd ./subprojects/wlroots && meson build/ --buildtype=release && ninja -C build/ && cp ./build/libwlroots.so.11032 /usr/lib/ && cd ../.. + make protocols + make release + cd hyprctl && make all && cd .. - make all mkdir -p ${PREFIX}/share/wayland-sessions cp ./example/hyprland.desktop ${PREFIX}/share/wayland-sessions/ mkdir -p ${PREFIX}/bin @@ -122,12 +124,6 @@ install: cp ./assets/wall_4K.png ${PREFIX}/share/hyprland cp ./assets/wall_8K.png ${PREFIX}/share/hyprland - rm -rf /usr/include/wlr - rm -f /usr/lib/libwlroots.so - rm -f /usr/lib/pkgconfig/wlroots.pc - [ ! -d /usr/include/wlrBackup ] || mv /usr/include/wlrBackup /usr/include/wlr - [ ! -f /usr/lib/libwlroots.so.backup ] || mv -f /usr/lib/libwlroots.so.backup /usr/lib/libwlroots.so - [ ! -f /usr/lib/pkgconfig/wlroots.pc.backup ] || mv -f /usr/lib/pkgconfig/wlroots.pc.backup /usr/lib/pkgconfig/wlroots.pc uninstall: rm -f ${PREFIX}/share/wayland-sessions/hyprland.desktop