summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1999-10-25 14:15:09 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1999-10-25 14:15:09 +0000
commit72d3f610f4545387652a27621cbb2daf615c1095 (patch)
tree37ad191c66f30523389522a8bce02dbf66bd0bc8
parentChanged to use interrupt driven console. (diff)
downloadrtems-72d3f610f4545387652a27621cbb2daf615c1095.tar.bz2
Merged scripts-19991022-0 changes from Ralf.
-rw-r--r--scripts/Makefile.in20
-rw-r--r--scripts/aclocal.m44
-rw-r--r--scripts/binutils/Makefile.in20
-rw-r--r--scripts/binutils/binutils.spec.in16
-rw-r--r--scripts/configure15
-rw-r--r--scripts/configure.in2
-rw-r--r--scripts/gccnewlib/Makefile.in20
-rw-r--r--scripts/gccnewlib/gccnewlib.spec.in81
-rw-r--r--scripts/gdb/Makefile.in20
-rw-r--r--scripts/gdb/gdb.spec.in6
10 files changed, 82 insertions, 122 deletions
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 3193c1ecae..3f63185c7b 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
@@ -46,10 +46,9 @@ AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
transform = @program_transform_name@
NORMAL_INSTALL = :
@@ -101,14 +100,14 @@ mkbspspec.in mkgccnewlibspec.in mkgdbspec.in mkinstalldirs
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-TAR = gtar
+TAR = tar
GZIP_ENV = --best
all: all-redirect
.SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile
+ cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \
&& CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
@@ -257,15 +256,10 @@ distdir: $(DISTFILES)
-rm -rf $(distdir)
mkdir $(distdir)
-chmod 777 $(distdir)
- here=`cd $(top_builddir) && pwd`; \
- top_distdir=`cd $(distdir) && pwd`; \
- distdir=`cd $(distdir) && pwd`; \
- cd $(top_srcdir) \
- && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Makefile
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
- cp -pr $$d/$$file $(distdir)/$$file; \
+ cp -pr $$/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -304,7 +298,7 @@ uninstall: uninstall-recursive
all-am: Makefile $(SCRIPTS) $(DATA)
all-redirect: all-recursive
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
installdirs: installdirs-recursive
installdirs-am:
diff --git a/scripts/aclocal.m4 b/scripts/aclocal.m4
index c5e88eb66d..9f8add8f0d 100644
--- a/scripts/aclocal.m4
+++ b/scripts/aclocal.m4
@@ -1,4 +1,4 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4a
+dnl aclocal.m4 generated automatically by aclocal 1.4
dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
@@ -21,8 +21,6 @@ dnl AM_INIT_AUTOMAKE(package,version, [no-define])
AC_DEFUN(AM_INIT_AUTOMAKE,
[AC_REQUIRE([AC_PROG_INSTALL])
-dnl We require 2.13 because we rely on SHELL being computed by configure.
-AC_PREREQ([2.13])
PACKAGE=[$1]
AC_SUBST(PACKAGE)
VERSION=[$2]
diff --git a/scripts/binutils/Makefile.in b/scripts/binutils/Makefile.in
index 5be140f630..20f4078328 100644
--- a/scripts/binutils/Makefile.in
+++ b/scripts/binutils/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
@@ -46,10 +46,9 @@ AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
transform = @program_transform_name@
NORMAL_INSTALL = :
@@ -97,14 +96,14 @@ DIST_COMMON = Makefile.am Makefile.in
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-TAR = gtar
+TAR = tar
GZIP_ENV = --best
all: all-redirect
.SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOMAKE) --foreign binutils/Makefile
+ cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps binutils/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
@@ -136,15 +135,10 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = binutils
distdir: $(DISTFILES)
- here=`cd $(top_builddir) && pwd`; \
- top_distdir=`cd $(top_distdir) && pwd`; \
- distdir=`cd $(distdir) && pwd`; \
- cd $(top_srcdir) \
- && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign binutils/Makefile
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
- cp -pr $$d/$$file $(distdir)/$$file; \
+ cp -pr $$/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -173,7 +167,7 @@ uninstall: uninstall-am
all-am: Makefile $(DATA)
all-redirect: all-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
installdirs:
$(mkinstalldirs) $(DESTDIR)$(RPM_SPECSdir)
diff --git a/scripts/binutils/binutils.spec.in b/scripts/binutils/binutils.spec.in
index b8f8b85862..49945c45c5 100644
--- a/scripts/binutils/binutils.spec.in
+++ b/scripts/binutils/binutils.spec.in
@@ -47,14 +47,13 @@ Authors:
...
%prep
-echo RPM_BUILD_ROOT=${RPM_BUILD_ROOT}
# untar the sources inside @target_alias@-binutils
%setup -c -n @target_alias@-binutils -a 0
%patch0 -p0
+ test -d build || mkdir build
%build
- test -d build || mkdir build
cd build
../binutils-@binutils_version@/configure --target=@target_alias@ \
--verbose --prefix=/opt/rtems
@@ -89,7 +88,7 @@ echo RPM_BUILD_ROOT=${RPM_BUILD_ROOT}
then
rm -f $RPM_INSTALL_PREFIX/rtems/info/dir
f=`find $RPM_INSTALL_PREFIX/rtems/info -name '*.info.gz'`
- test -n "$f" && for i in $f; do
+ test x"$f" != x"" && for i in $f; do
install-info $i $RPM_INSTALL_PREFIX/rtems/info/dir
done
fi
@@ -99,13 +98,13 @@ echo RPM_BUILD_ROOT=${RPM_BUILD_ROOT}
then
rm -f $RPM_INSTALL_PREFIX/rtems/info/dir
f=`find $RPM_INSTALL_PREFIX/rtems/info -name '*.info.gz'`
- test -n "$f" && for i in $f; do
+ test x"$f" != x"" && for i in $f; do
install-info $i $RPM_INSTALL_PREFIX/rtems/info/dir
done
fi
%files -f files
-%docdir /opt/rtems/info
+%dir /opt/rtems/info
%doc /opt/rtems/info/dir
%doc /opt/rtems/info/as.info.gz
%doc /opt/rtems/info/as.info-?.gz
@@ -118,8 +117,8 @@ echo RPM_BUILD_ROOT=${RPM_BUILD_ROOT}
%doc /opt/rtems/info/gasp.info.gz
%doc /opt/rtems/info/standards.info.gz
-%docdir /opt/rtems/man
-%docdir /opt/rtems/man/man1
+%dir /opt/rtems/man
+%dir /opt/rtems/man/man1
%doc /opt/rtems/man/man1/@target_alias@-*.1
%dir /opt/rtems/bin
@@ -161,5 +160,4 @@ echo RPM_BUILD_ROOT=${RPM_BUILD_ROOT}
/opt/rtems/@target_alias@/bin/strip
%dir /opt/rtems/@target_alias@/lib
-%dir /opt/rtems/@target_alias@/lib/ldscripts
-/opt/rtems/@target_alias@/lib/ldscripts/*
+/opt/rtems/@target_alias@/lib/ldscripts
diff --git a/scripts/configure b/scripts/configure
index 630669d2a2..7a2a034535 100644
--- a/scripts/configure
+++ b/scripts/configure
@@ -689,10 +689,9 @@ else
fi
-
PACKAGE=scripts
-VERSION=19991021-1
+VERSION=19991022-0
if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
{ echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -702,7 +701,7 @@ fi
missing_dir=`cd $ac_aux_dir && pwd`
echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:706: checking for working aclocal" >&5
+echo "configure:705: checking for working aclocal" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
@@ -715,7 +714,7 @@ else
fi
echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:719: checking for working autoconf" >&5
+echo "configure:718: checking for working autoconf" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
@@ -728,7 +727,7 @@ else
fi
echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:732: checking for working automake" >&5
+echo "configure:731: checking for working automake" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
@@ -741,7 +740,7 @@ else
fi
echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:745: checking for working autoheader" >&5
+echo "configure:744: checking for working autoheader" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
@@ -754,7 +753,7 @@ else
fi
echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:758: checking for working makeinfo" >&5
+echo "configure:757: checking for working makeinfo" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
@@ -778,7 +777,7 @@ test -f ./setup.cache || cp ${srcdir}/setup.def ./setup.cache
# redhat uses /usr/src/redhat
# others might use /usr/src
echo $ac_n "checking for rpm SPECS directory""... $ac_c" 1>&6
-echo "configure:782: checking for rpm SPECS directory" >&5
+echo "configure:781: checking for rpm SPECS directory" >&5
if test -d /usr/src/packages/SPECS;
then
RPM_SPECSdir=/usr/src/packages/SPECS;
diff --git a/scripts/configure.in b/scripts/configure.in
index 2ea0e05a5c..b608db354e 100644
--- a/scripts/configure.in
+++ b/scripts/configure.in
@@ -1,7 +1,7 @@
## $Id$
AC_INIT(binutils)
-AM_INIT_AUTOMAKE(scripts,19991021-1,no)
+AM_INIT_AUTOMAKE(scripts,19991022-0,no)
# RTEMS_CHECK_VERSION(..)
RTEMS_VERSION=GET_RTEMS_VERSION_XXX
diff --git a/scripts/gccnewlib/Makefile.in b/scripts/gccnewlib/Makefile.in
index a37d562684..f35b781d61 100644
--- a/scripts/gccnewlib/Makefile.in
+++ b/scripts/gccnewlib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
@@ -46,10 +46,9 @@ AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
transform = @program_transform_name@
NORMAL_INSTALL = :
@@ -97,14 +96,14 @@ DIST_COMMON = Makefile.am Makefile.in
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-TAR = gtar
+TAR = tar
GZIP_ENV = --best
all: all-redirect
.SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOMAKE) --foreign gccnewlib/Makefile
+ cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps gccnewlib/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
@@ -136,15 +135,10 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = gccnewlib
distdir: $(DISTFILES)
- here=`cd $(top_builddir) && pwd`; \
- top_distdir=`cd $(top_distdir) && pwd`; \
- distdir=`cd $(distdir) && pwd`; \
- cd $(top_srcdir) \
- && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign gccnewlib/Makefile
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
- cp -pr $$d/$$file $(distdir)/$$file; \
+ cp -pr $$/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -173,7 +167,7 @@ uninstall: uninstall-am
all-am: Makefile $(DATA)
all-redirect: all-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
installdirs:
$(mkinstalldirs) $(DESTDIR)$(RPM_SPECSdir)
diff --git a/scripts/gccnewlib/gccnewlib.spec.in b/scripts/gccnewlib/gccnewlib.spec.in
index 8191d4cc3b..150f234fc7 100644
--- a/scripts/gccnewlib/gccnewlib.spec.in
+++ b/scripts/gccnewlib/gccnewlib.spec.in
@@ -9,9 +9,11 @@
Vendor: OAR Corporation
Distribution: Linux
Name: @target_alias@-gcc
+Summary: gcc and newlib C Library for @target_alias@.
+Group: unsorted
Release: @Release@
Copyright: 1999 OARCorp
-Group: unsorted
+
Provides: @target_alias@-gcc-newlib
Requires: @target_alias@-binutils
@@ -19,7 +21,6 @@ Autoreqprov: on
Packager: corsepiu@faw.uni-ulm.de and joel@OARcorp.com
Version: @gcc_version@newlib@newlib_version@
-Summary: rtems gcc and newlib C Library for target @target_alias@
Source0: ftp://ftp.gnu.org/pub/gnu/gcc/gcc-@gcc_version@.tar.gz
Source1: ftp://sourceware.cygnus/com/pub/newlib/newlib-@newlib_version@.tar.gz
Patch0: gcc-@gcc_version@-rtems-@gcc_patch_version@.diff
@@ -50,19 +51,32 @@ Authors:
Joel Sherrill (joel@oarcorp.com)
...
+%package -n @target_alias@-gcc-newlib
+Summary: rtems gcc and newlib C Library for target @target_alias@
+Group: unsorted
+
+%description -n @target_alias@-gcc-newlib
+RTEMS is an open source operating system for embedded systems.
+
+This is gcc and newlib C Library for @target_alias@.
+
+Authors:
+--------
+ Joel Sherrill (joel@oarcorp.com)
+ ...
+
%prep
-echo RPM_BUILD_ROOT=${RPM_BUILD_ROOT}
-# untar the sources inside @target_alias@-gcc-newlib -@Version@
+# untar the sources inside @target_alias@-gcc-newlib
%setup -c -n @target_alias@-gcc-newlib -a 0 -a 1
%patch0 -p0
%patch1 -p0
- # Now link the C library into the source tree
- ln -s ../newlib-1.8.2/newlib gcc-@gcc_version@
+ # Copy the C library into gcc's source tree
+ ln -s ../newlib-@newlib_version@/newlib gcc-@gcc_version@
+ test -d build || mkdir build
%build
- test -d build || mkdir build
cd build
../gcc-@gcc_version@/configure --target=@target_alias@ \
--with-gnu-as --with-gnu-ld --with-newlib --verbose \
@@ -84,6 +98,11 @@ echo RPM_BUILD_ROOT=${RPM_BUILD_ROOT}
%install
cd build
+ # Bug in gcc-2.95.1: It doesn't build this installation directory
+ # If it doesn't find it, gcc doesn't install @target_alias@/bin/gcc
+ ../gcc-@gcc_version@/mkinstalldirs \
+ $RPM_BUILD_ROOT/opt/rtems/@target_alias@/bin
+
make prefix=$RPM_BUILD_ROOT/opt/rtems install
cd @target_alias@/newlib
make prefix=$RPM_BUILD_ROOT/opt/rtems install-info
@@ -96,39 +115,6 @@ echo RPM_BUILD_ROOT=${RPM_BUILD_ROOT}
gzip -f $RPM_BUILD_ROOT/opt/rtems/info/*.info-? 2>/dev/null
gzip -f $RPM_BUILD_ROOT/opt/rtems/info/*.info-?? 2>/dev/null
- rm -f files
-
- # collect c++ headers
- if test -d $RPM_BUILD_ROOT/opt/rtems/include/g++-3; then
- find $RPM_BUILD_ROOT/opt/rtems/include/g++-3 \
- -type d | \
- sed -e "s,^$RPM_BUILD_ROOT,%dir ,g" >> files
- find $RPM_BUILD_ROOT/opt/rtems/include/g++-3 \
- \( -type f -o -type l \) | \
- sed -e "s,^$RPM_BUILD_ROOT,,g" >> files
- fi
-
- # collect target gcc-lib
- if test -d "$RPM_BUILD_ROOT/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@"; \
- then
- find "$RPM_BUILD_ROOT/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@" \
- -type d | sed -e "s,^$RPM_BUILD_ROOT,%dir ,g" >> files
- find "$RPM_BUILD_ROOT/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@" \
- \( -type f -o -type l \) \
- | sed -e "s,^$RPM_BUILD_ROOT,,g" >> files
- fi
-
- # collect target files
- if test -d "$RPM_BUILD_ROOT/opt/rtems/@target_alias@"; \
- then
- find "$RPM_BUILD_ROOT/opt/rtems/@target_alias@" \
- -type d | \
- sed -e "s,^$RPM_BUILD_ROOT,%dir ,g" >> files
- find "$RPM_BUILD_ROOT/opt/rtems/@target_alias@" \
- \( -type f -o -type l \) | \
- sed -e "s,^$RPM_BUILD_ROOT,,g" >> files
- fi
-
%post
if test -d $RPM_INSTALL_PREFIX/rtems/info;
then
@@ -149,8 +135,8 @@ echo RPM_BUILD_ROOT=${RPM_BUILD_ROOT}
done
fi
-%files -f build/files
-%docdir /opt/rtems/info
+%files -n @target_alias@-gcc-newlib
+%dir /opt/rtems/info
%doc /opt/rtems/info/dir
%doc /opt/rtems/info/chill.info*
%doc /opt/rtems/info/cpp.info*
@@ -159,8 +145,8 @@ echo RPM_BUILD_ROOT=${RPM_BUILD_ROOT}
%doc /opt/rtems/info/libc.info*
%doc /opt/rtems/info/libm.info*
-%docdir /opt/rtems/man
-%docdir /opt/rtems/man/man1
+%dir /opt/rtems/man
+%dir /opt/rtems/man/man1
%doc /opt/rtems/man/man1/cccp.1
%doc /opt/rtems/man/man1/@target_alias@-gcc.1
%doc /opt/rtems/man/man1/@target_alias@-g++.1
@@ -182,9 +168,12 @@ echo RPM_BUILD_ROOT=${RPM_BUILD_ROOT}
/opt/rtems/bin/@target_alias@-unprotoize
%dir /opt/rtems/lib
-/opt/rtems/lib/libiberty*
+# We use libiberty from binutils
+# /opt/rtems/lib/libiberty*
%dir /opt/rtems/include
+/opt/rtems/include/g++-3
%dir /opt/rtems/lib/gcc-lib
-%dir /opt/rtems/lib/gcc-lib/@target_alias@
+/opt/rtems/lib/gcc-lib/@target_alias@
+/opt/rtems/@target_alias@
diff --git a/scripts/gdb/Makefile.in b/scripts/gdb/Makefile.in
index 00c2c14171..4b80e2cbaa 100644
--- a/scripts/gdb/Makefile.in
+++ b/scripts/gdb/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
@@ -46,10 +46,9 @@ AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
transform = @program_transform_name@
NORMAL_INSTALL = :
@@ -97,14 +96,14 @@ DIST_COMMON = Makefile.am Makefile.in
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-TAR = gtar
+TAR = tar
GZIP_ENV = --best
all: all-redirect
.SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOMAKE) --foreign gdb/Makefile
+ cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps gdb/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
@@ -136,15 +135,10 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = gdb
distdir: $(DISTFILES)
- here=`cd $(top_builddir) && pwd`; \
- top_distdir=`cd $(top_distdir) && pwd`; \
- distdir=`cd $(distdir) && pwd`; \
- cd $(top_srcdir) \
- && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign gdb/Makefile
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
- cp -pr $$d/$$file $(distdir)/$$file; \
+ cp -pr $$/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -173,7 +167,7 @@ uninstall: uninstall-am
all-am: Makefile $(DATA)
all-redirect: all-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
installdirs:
$(mkinstalldirs) $(DESTDIR)$(RPM_SPECSdir)
diff --git a/scripts/gdb/gdb.spec.in b/scripts/gdb/gdb.spec.in
index e3ba2479a6..077ea26c98 100644
--- a/scripts/gdb/gdb.spec.in
+++ b/scripts/gdb/gdb.spec.in
@@ -91,13 +91,13 @@ test -d build || mkdir build
fi
%files
-%docdir /opt/rtems/info
+%dir /opt/rtems/info
%doc /opt/rtems/info/gdb.info*
%doc /opt/rtems/info/mmalloc.info*
%doc /opt/rtems/info/readline.info*
-%docdir /opt/rtems/man
-%docdir /opt/rtems/man/man1
+%dir /opt/rtems/man
+%dir /opt/rtems/man/man1
%doc /opt/rtems/man/man1/@target_alias@-gdb.1
%dir /opt/rtems/include