From 26c60eab3dcbbdbc3b1b4890c46d56d03ae43b925097079f9d39cc3c3bfee993 Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.com>
Date: Tue, 12 Dec 2017 14:40:09 +0000
Subject: [PATCH] - Adjust sysroot to /usr/avr/sys-root as agreed upon by gcc
 and binutils.

OBS-URL: https://build.opensuse.org/package/show/devel:gcc/avr-libc?expand=0&rev=4
---
 avr-libc.changes |  5 +++++
 avr-libc.spec    | 12 ++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/avr-libc.changes b/avr-libc.changes
index 39c1d64..5de6d91 100644
--- a/avr-libc.changes
+++ b/avr-libc.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec 12 14:39:35 UTC 2017 - rguenther@suse.com
+
+- Adjust sysroot to /usr/avr/sys-root as agreed upon by gcc and binutils.
+
 -------------------------------------------------------------------
 Tue Dec 12 14:27:02 UTC 2017 - rguenther@suse.com
 
diff --git a/avr-libc.spec b/avr-libc.spec
index 826d5bb..4f1a398 100644
--- a/avr-libc.spec
+++ b/avr-libc.spec
@@ -16,10 +16,10 @@
 #
 
 
-%define into_usr_avr 1
+%define into_sysroot 1
 %define doc_vers %{version}
-%if %{into_usr_avr}
-%define PREFIX /usr/avr
+%if %{into_sysroot}
+%define PREFIX /usr/avr/sys-root
 %else
 # FIXME:
 # okay, FHS 2.2, if you forbid the obvious choices, can you also suggest a better place?
@@ -113,9 +113,9 @@ make test CFLAGS="-Wall -g -Os -mint8 -I$RPM_BUILD_ROOT%PREFIX/avr/include/ -L$R
 %files
 %defattr (-, root, root)
 %doc %{_docdir}/%{name}
-%if %{into_usr_avr}
-%dir /usr/avr
-/usr/avr/*
+%if %{into_sysroot}
+%dir %{PREFIX}
+%{PREFIX}/*
 %else
 %{_prefix}/*
 %endif