summaryrefslogtreecommitdiffstats
path: root/scripts/common
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-09-02 16:41:50 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-09-02 16:41:50 +0000
commit087a6c86f55b8ddbd6a5bc1961e28a044225475f (patch)
tree5c71ad71a2d40b73f01790d14c082780c9418b3e /scripts/common
parent2003-08-28 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-087a6c86f55b8ddbd6a5bc1961e28a044225475f.tar.bz2
2003-09-02 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am, configure.ac, autotools/autoconf-rtems.spec.in, autotools/automake-rtems.spec.in, binutils/Makefile.am, binutils/base-binutils.add, binutils/binutils.add, binutils/mkspec.in, binutils/target-binutils.add, common/common.add.in, cpukit/Makefile.am, gcc3newlib/Makefile.am, gcc3newlib/base-g77.add, gcc3newlib/base-gcc.add, gcc3newlib/base-gcj.add, gcc3newlib/base-gnat.add, gcc3newlib/gccnewlib.add, gcc3newlib/mkspec.in, gcc3newlib/target-c++.add, gcc3newlib/target-g77.add, gcc3newlib/target-gcc.add, gcc3newlib/target-gcj.add, gcc3newlib/target-gnat.add, gcc3newlib/target-objc.add, gccnewlib/Makefile.am, gdb/Makefile.am, rtems/Makefile.am, rtemsdoc/Makefile.am: Merger from rtems-4-6-branch. * common/common.am: New.
Diffstat (limited to 'scripts/common')
-rw-r--r--scripts/common/common.add.in12
-rw-r--r--scripts/common/common.am4
2 files changed, 14 insertions, 2 deletions
diff --git a/scripts/common/common.add.in b/scripts/common/common.add.in
index 12f3a55c10..9365c88138 100644
--- a/scripts/common/common.add.in
+++ b/scripts/common/common.add.in
@@ -5,6 +5,14 @@
#
%define _prefix @prefix@
+%if "%{_prefix}" != "/usr"
+%define _infodir %{_prefix}/info
+%define _mandir %{_prefix}/man
+%endif
+
+%define rpmprefix @rpmprefix@
+%define rpmgroup @rpmgroup@
+
%define _defaultbuildroot %{_tmppath}/%{name}-%{version}-root
%ifos cygwin cygwin32
%define _exeext .exe
@@ -12,8 +20,8 @@
%define _exeext %{nil}
%endif
-# Without this, RPM-4.x' rpm-brp-strip screws up on cross-binaries
-%define __os_install_post %{nil}
+# Work around to a bug in rpm-4.2
+%define __os_install_post %{nil}
Vendor: OARCorp
Distribution: Linux
diff --git a/scripts/common/common.am b/scripts/common/common.am
new file mode 100644
index 0000000000..a1c6b651a2
--- /dev/null
+++ b/scripts/common/common.am
@@ -0,0 +1,4 @@
+$(top_builddir)/common/common.add: $(top_builddir)/config.status $(top_srcdir)/common/common.add.in
+ cd $(top_builddir) && $(SHELL) ./config.status common/common.add
+$(top_builddir)/common/clean.add: $(top_builddir)/config.status $(top_srcdir)/common/clean.add.in
+ cd $(top_builddir) && $(SHELL) ./config.status common/clean.add