From 382b6d3f6b26284388cfe3181c447f11a8dc9bee Mon Sep 17 00:00:00 2001 From: Vaxry Date: Fri, 12 Apr 2024 18:07:04 +0100 Subject: [PATCH] makefile: move wlr headers dir --- Makefile | 8 ++++---- hyprland.pc.in | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 8407385b..432dd4eb 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ debug: clear: rm -rf build rm -f ./protocols/*-protocol.h ./protocols/*-protocol.c - rm -rf ./subprojects/wlroots/build + rm -rf ./subprojects/wlroots-hyprland/build all: @if [[ "$EUID" = 0 ]]; then echo -en "Avoid running $(MAKE) all as sudo.\n"; fi @@ -89,12 +89,12 @@ installheaders: rm -fr ${PREFIX}/include/hyprland mkdir -p ${PREFIX}/include/hyprland mkdir -p ${PREFIX}/include/hyprland/protocols - mkdir -p ${PREFIX}/include/hyprland/wlroots + mkdir -p ${PREFIX}/include/hyprland/wlroots-hyprland mkdir -p ${PREFIX}/share/pkgconfig find src -name '*.h*' -print0 | cpio --quiet -0dump ${PREFIX}/include/hyprland - cd subprojects/wlroots/include && find . -name '*.h*' -print0 | cpio --quiet -0dump ${PREFIX}/include/hyprland/wlroots && cd ../../.. - cd subprojects/wlroots/build/include && find . -name '*.h*' -print0 | cpio --quiet -0dump ${PREFIX}/include/hyprland/wlroots && cd ../../../.. + cd subprojects/wlroots-hyprland/include && find . -name '*.h*' -print0 | cpio --quiet -0dump ${PREFIX}/include/hyprland/wlroots-hyprland && cd ../../.. + cd subprojects/wlroots-hyprland/build/include && find . -name '*.h*' -print0 | cpio --quiet -0dump ${PREFIX}/include/hyprland/wlroots-hyprland && cd ../../../.. cp ./protocols/*-protocol.h ${PREFIX}/include/hyprland/protocols cp ./build/hyprland.pc ${PREFIX}/share/pkgconfig if [ -d /usr/share/pkgconfig ]; then cp ./build/hyprland.pc /usr/share/pkgconfig 2>/dev/null || true; fi diff --git a/hyprland.pc.in b/hyprland.pc.in index 36d5907d..c93e8f42 100644 --- a/hyprland.pc.in +++ b/hyprland.pc.in @@ -5,4 +5,4 @@ Name: Hyprland URL: https://github.com/hyprwm/Hyprland Description: Hyprland header files Version: @HYPRLAND_VERSION@ -Cflags: -I"${includedir}/hyprland/protocols" -I"${includedir}/hyprland/wlroots" -I"${includedir}" +Cflags: -I"${includedir}/hyprland/protocols" -I"${includedir}/hyprland/wlroots-hyprland" -I"${includedir}"