5 files changed, 32 insertions, 18 deletions
diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 221f3bd55f..25f6e97d6f 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-02	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* gccnewlib/Makefile.am: Use target-libc.add
+	* gccnewlib/gccnewlib.add, gccnewlib/target-gcc.add,
+	gccnewlib/target-libc.add: Misc. fixes.
+
 2005-09-01	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* gdb/gdb.add: Remove Packager:.
diff --git a/scripts/gccnewlib/Makefile.am b/scripts/gccnewlib/Makefile.am
index 871c96c786..76becb50d9 100644
--- a/scripts/gccnewlib/Makefile.am
+++ b/scripts/gccnewlib/Makefile.am
@@ -11,6 +11,7 @@ SUBPACKAGES += $(top_builddir)/common/common.add
 SUBPACKAGES += gccnewlib.add
 SUBPACKAGES += $(top_builddir)/common/clean.add
 SUBPACKAGES += base-gcc.add target-gcc.add
+SUBPACKAGES += target-libc.add
 SUBPACKAGES += base-g77.add target-g77.add
 SUBPACKAGES += base-gcj.add target-gcj.add
 SUBPACKAGES += base-gfortran.add target-gfortran.add
diff --git a/scripts/gccnewlib/gccnewlib.add b/scripts/gccnewlib/gccnewlib.add
index a39fc3b0fb..e7a6a88ecc 100644
--- a/scripts/gccnewlib/gccnewlib.add
+++ b/scripts/gccnewlib/gccnewlib.add
@@ -174,7 +174,7 @@ chmod +x brp-rtems-compress
 
   # Copy the C library into gcc's source tree
   ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_version}
-  test -d build || mkdir build
+  mkdir -p build
 
 %build
   cd build
@@ -220,7 +220,7 @@ chmod +x brp-rtems-compress
 %if "%_host" != "%_build"
   # Bug in gcc-3.2.1:
   # Somehow, gcc doesn't get syslimits.h right for Cdn-Xs
-  test -d gcc/include || mkdir -p gcc/include
+  mkdir -p gcc/include
   cp ../gcc-%{gcc_version}/gcc/gsyslimits.h gcc/include/syslimits.h
 %endif
 
@@ -308,28 +308,33 @@ chmod +x brp-rtems-compress
   fi
 %endif
 
-  rm -f dirs ;
-  echo "%defattr(-,root,root)" >> dirs
-%if "%{_prefix}" != "/usr"
-  echo "%dir %{_libdir}" >> dirs ;
-%endif
-  echo "%dir %{gcclib}" >> dirs ;
-  echo "%dir %{gcclib}/%{gcc_target}" >> dirs ;
-
   # Collect multilib subdirectories
   f=`gcc/xgcc -Bgcc/ --print-multi-lib | sed -e 's,;.*$,,'`
 
-  TGTDIR="%{gcclib}/%{gcc_target}/%{gcc_version}"
+  echo "%defattr(-,root,root,-)" > files.libc
+  TGTDIR="%{_prefix}/%{gcc_target}/lib"
   for i in $f; do
     case $i in
-    \.) echo "%dir ${TGTDIR}" >> dirs
+    \.) echo "%dir ${TGTDIR}" >> files.libc
       ;;
-    *)  echo "%dir ${TGTDIR}/$i" >> dirs
+    *)  echo "%dir ${TGTDIR}/$i" >> files.libc
       ;;
     esac
   done
 
-  TGTDIR="%{_prefix}/%{gcc_target}/lib"
+  rm -f dirs ;
+  echo "%defattr(-,root,root,-)" >> dirs
+%if "%{_prefix}" != "/usr"
+  echo "%dir %{_prefix}" >> dirs
+  echo "%dir %{_libdir}" >> dirs
+%if "%{gcc_version}" >= "3.4"
+  echo "%dir %{_libexecdir}" >> dirs
+%endif
+%endif
+  echo "%dir %{gcclib}" >> dirs
+  echo "%dir %{gcclib}/%{gcc_target}" >> dirs
+
+  TGTDIR="%{gcclib}/%{gcc_target}/%{gcc_version}"
   for i in $f; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> dirs
@@ -380,8 +385,8 @@ chmod +x brp-rtems-compress
     case $i in
     *lib*.la) rm ${RPM_BUILD_ROOT}/$i;; # ignore - gcc produces bogus libtool libs
     *libiberty.a) rm ${RPM_BUILD_ROOT}/$i ;; # ignore - GPL'ed
-# all other files belong to gcc
-    *) echo "$i" >> files.gcc ;; 
+# all other files belong to libc
+    *) echo "$i" >> files.libc ;; 
     esac
   done
 
diff --git a/scripts/gccnewlib/target-gcc.add b/scripts/gccnewlib/target-gcc.add
index ff0867663d..32372a16d2 100644
--- a/scripts/gccnewlib/target-gcc.add
+++ b/scripts/gccnewlib/target-gcc.add
@@ -36,8 +36,6 @@ This is gcc for %{gcc_target}.
 %{_bindir}/%{gcc_target}-gcov%{_exeext}
 %{_bindir}/%{gcc_target}-gccbug
 
-%{_prefix}/%{gcc_target}/include
-
 %dir %{gcclib}/%{gcc_target}/%{gcc_version}/include
 
 %dir %{gccexec}
diff --git a/scripts/gccnewlib/target-libc.add b/scripts/gccnewlib/target-libc.add
index 2e08a397f3..195d62b4df 100644
--- a/scripts/gccnewlib/target-libc.add
+++ b/scripts/gccnewlib/target-libc.add
@@ -15,4 +15,8 @@ This is the newlib C Library for %{gcc_target}.
 
 %files -n %{rpmprefix}%{gcc_target}-libc -f build/files.libc
 %defattr(-,root,root)
+%if "%{_prefix}" != "/usr"
+%dir %{_prefix}
+%endif
+%dir %{_prefix}/%{gcc_target}
 %{_prefix}/%{gcc_target}/include