diff options
| author | jbj <devnull@localhost> | 2003-07-02 19:26:04 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 2003-07-02 19:26:04 +0000 |
| commit | 3182fc3777e17e1ee37ef05b342710982de27d87 (patch) | |
| tree | b14514faae62b35cbd8d0018a4be5cec5b6277db /configure.ac | |
| parent | d0594e1ce00578e3b2afad060076abd6c5fd9300 (diff) | |
| download | rpm-3182fc3777e17e1ee37ef05b342710982de27d87.tar.gz rpm-3182fc3777e17e1ee37ef05b342710982de27d87.tar.bz2 rpm-3182fc3777e17e1ee37ef05b342710982de27d87.zip | |
- don't attempt to remove dbenv on --rebuilddb.
- autorelocate ix86 package file paths on ia64.
CVS patchset: 6925
CVS date: 2003/07/02 19:26:04
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index b6e22918d..56b01adc3 100644 --- a/configure.ac +++ b/configure.ac @@ -1154,12 +1154,14 @@ esac AC_SUBST(MARK64) dnl Determine the canonical arch-vendor-os for the build machine +autorelocate_path='%{nil}' case "${build_cpu}" in *86) RPMCANONCOLOR=0; RPMCANONARCH=i386 ;; x86_64*) RPMCANONCOLOR=3; RPMCANONARCH=x86_64 ;; alpha*) RPMCANONCOLOR=0; RPMCANONARCH=alpha ;; sparc*) RPMCANONCOLOR=0; RPMCANONARCH=sparc ;; -ia64*) RPMCANONCOLOR=0; RPMCANONARCH=ia64 ;; +ia64*) RPMCANONCOLOR=2; RPMCANONARCH=ia64; + autorelocate_path='/emul/%%{ARCH}-%%{OS}' ;; s390x*) RPMCANONCOLOR=3; RPMCANONARCH=s390x ;; s390*) RPMCANONCOLOR=0; RPMCANONARCH=s390 ;; powerpc64*|ppc64*) RPMCANONCOLOR=3; RPMCANONARCH=ppc64 ;; @@ -1189,6 +1191,7 @@ unknown|pc|ibm|redhat|pld|mandrake|conectiva|lvr|yellowdog) esac RPMCANONOS="$build_os_noversion" AC_SUBST(RPMCANONCOLOR) +AC_SUBST(autorelocate_path) AC_SUBST(RPMCANONARCH) AC_SUBST(RPMCANONVENDOR) AC_SUBST(RPMCANONOS) |