From 8b0953a79535296afe06a933e5404d10e8e71d00 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Thu, 4 Jul 2019 16:41:42 +0200 Subject: [PATCH] Libraries: Unbreak "make install" with new directory locations. --- Libraries/LibC/Makefile | 14 +++++++------- Libraries/LibCore/Makefile | 12 ++++++------ Libraries/LibGUI/Makefile | 6 +++--- Libraries/LibHTML/Makefile | 6 +++--- Libraries/LibM/Makefile | 4 ++-- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Libraries/LibC/Makefile b/Libraries/LibC/Makefile index baead86adb..922cb014d4 100644 --- a/Libraries/LibC/Makefile +++ b/Libraries/LibC/Makefile @@ -83,12 +83,12 @@ clean: @echo "CLEAN"; rm -f $(LIBRARY) $(CPP_OBJS) $(ASM_OBJS) *.d install: $(LIBRARY) startfiles - mkdir -p ../Root/usr/include - mkdir -p ../Root/usr/lib + mkdir -p ../../Root/usr/include + mkdir -p ../../Root/usr/lib # Copy headers - rsync -r -a --include '*/' --include '*.h' --exclude '*' . ../Root/usr/include + rsync -r -a --include '*/' --include '*.h' --exclude '*' . ../../Root/usr/include # Install the library - cp $(LIBRARY) ../Root/usr/lib - cp crt0.o ../Root/usr/lib/ - cp crti.ao ../Root/usr/lib/crti.o - cp crtn.ao ../Root/usr/lib/crtn.o + cp $(LIBRARY) ../../Root/usr/lib + cp crt0.o ../../Root/usr/lib/ + cp crti.ao ../../Root/usr/lib/crti.o + cp crtn.ao ../../Root/usr/lib/crtn.o diff --git a/Libraries/LibCore/Makefile b/Libraries/LibCore/Makefile index 1f88103724..e7b25671e4 100644 --- a/Libraries/LibCore/Makefile +++ b/Libraries/LibCore/Makefile @@ -39,11 +39,11 @@ clean: @echo "CLEAN"; rm -f $(LIBRARY) $(OBJS) *.d install: $(LIBRARY) - mkdir -p ../Root/usr/include/LibCore - mkdir -p ../Root/usr/include/AK - mkdir -p ../Root/usr/lib + mkdir -p ../../Root/usr/include/LibCore + mkdir -p ../../Root/usr/include/AK + mkdir -p ../../Root/usr/lib # Copy headers - rsync -r -a --include '*/' --include '*.h' --exclude '*' . ../Root/usr/include/LibCore - rsync -r -a --include '*/' --include '*.h' --exclude '*' ../AK/ ../Root/usr/include/AK + rsync -r -a --include '*/' --include '*.h' --exclude '*' . ../../Root/usr/include/LibCore + rsync -r -a --include '*/' --include '*.h' --exclude '*' ../../AK/ ../../Root/usr/include/AK # Install the library - cp $(LIBRARY) ../Root/usr/lib + cp $(LIBRARY) ../../Root/usr/lib diff --git a/Libraries/LibGUI/Makefile b/Libraries/LibGUI/Makefile index 3065251dfa..33c1f4fdbc 100644 --- a/Libraries/LibGUI/Makefile +++ b/Libraries/LibGUI/Makefile @@ -82,8 +82,8 @@ clean: @echo "CLEAN"; rm -f $(LIBRARY) $(OBJS) *.d install: $(LIBRARY) - mkdir -p ../Root/usr/include/LibGUI + mkdir -p ../../Root/usr/include/LibGUI # Copy headers - rsync -r -a --include '*/' --include '*.h' --exclude '*' . ../Root/usr/include/LibGUI + rsync -r -a --include '*/' --include '*.h' --exclude '*' . ../../Root/usr/include/LibGUI # Install the library - cp $(LIBRARY) ../Root/usr/lib + cp $(LIBRARY) ../../Root/usr/lib diff --git a/Libraries/LibHTML/Makefile b/Libraries/LibHTML/Makefile index e3ed8e1daa..8bd100cde1 100644 --- a/Libraries/LibHTML/Makefile +++ b/Libraries/LibHTML/Makefile @@ -13,9 +13,9 @@ $(LIBRARY): $(LIBHTML_OBJS) @echo "LIB $@"; $(AR) rcs $@ $(LIBHTML_OBJS) install: $(LIBRARY) - mkdir -p ../Root/usr/include/LibHTML + mkdir -p ../../Root/usr/include/LibHTML # Copy headers - rsync -r -a --include '*/' --include '*.h' --exclude '*' . ../Root/usr/include/LibHTML + rsync -r -a --include '*/' --include '*.h' --exclude '*' . ../../Root/usr/include/LibHTML # Install the library - cp $(LIBRARY) ../Root/usr/lib + cp $(LIBRARY) ../../Root/usr/lib diff --git a/Libraries/LibM/Makefile b/Libraries/LibM/Makefile index ae73a473c8..dcf24e57af 100644 --- a/Libraries/LibM/Makefile +++ b/Libraries/LibM/Makefile @@ -20,6 +20,6 @@ clean: install: $(LIBRARY) # Copy headers - rsync -a --include '*/' --include '*.h' --exclude '*' . ../Root/usr/include + rsync -a --include '*/' --include '*.h' --exclude '*' . ../../Root/usr/include # Install the library - cp $(LIBRARY) ../Root/usr/lib + cp $(LIBRARY) ../../Root/usr/lib