Attachment #55249 for bug #81982




fi

MARK64=
#case "${target_cpu}" in
#x86_64*|ppc64*|powerpc64*|sparc64*|s390x*)	MARK64=64 ;;
#esac


autorelocate_path='%{nil}'


LIBDIR="`echo $libdir | sed 's-/lib$-/%{_lib}-'`"

RPMCONFIGDIR="`echo ${libdir}/rpm`"

cat >>confdefs.h <<_ACEOF
#define RPMCONFIGDIR "$RPMCONFIGDIR"

Lines 39-45 Link Here

(-)rpm-4.2.1.orig/file/Makefile.in (-1 / +1 lines)
39		39
40	#MAGIC = @datadir@/magic	40	#MAGIC = @datadir@/magic
41	#data_DATA = magic magic.mime magic.mgc magic.mime.mgc	41	#data_DATA = magic magic.mime magic.mgc magic.mime.mgc
42	pkglibdir = @prefix@/lib/rpm	42	pkglibdir = ${libdir}/rpm
43	ACLOCAL = @ACLOCAL@	43	ACLOCAL = @ACLOCAL@
44	AMDEP_FALSE = @AMDEP_FALSE@	44	AMDEP_FALSE = @AMDEP_FALSE@
45	AMDEP_TRUE = @AMDEP_TRUE@	45	AMDEP_TRUE = @AMDEP_TRUE@

Lines 8005-8013 Link Here

(-)rpm-4.2.1.orig/file/configure (-3 / +3 lines)
8005	export CFLAGS	8005	export CFLAGS
8006		8006
8007	MARK64=	8007	MARK64=
8008	case "${target_cpu}" in	8008	#case "${target_cpu}" in
8009	x86_64*) MARK64=64 ;;	8009	#x86_64*) MARK64=64 ;;
8010	esac	8010	#esac
8011		8011
8012		8012
8013	echo "$as_me:$LINENO: checking for ANSI C header files" >&5	8013	echo "$as_me:$LINENO: checking for ANSI C header files" >&5

Lines 9382-9390 Link Here

(-)rpm-4.2.1.orig/popt/configure (-3 / +3 lines)
9382		9382
9383		9383
9384	MARK64=	9384	MARK64=
9385	case "${target_cpu}" in	9385	#case "${target_cpu}" in
9386	x86_64\|powerpc64\|ppc64\|sparc64\|s390x*) MARK64=64 ;;	9386	#x86_64\|powerpc64\|ppc64\|sparc64\|s390x*) MARK64=64 ;;
9387	esac	9387	#esac
9388		9388
9389		9389
9390		9390

Lines 273-279 Link Here

(-)rpm-4.2.1.orig/scripts/Makefile.in (-1 / +1 lines)
273		273
274	installprefix = $(DESTDIR)	274	installprefix = $(DESTDIR)
275		275
276	configdir = ${prefix}/lib/rpm	276	configdir = ${libdir}/rpm
277	config_SCRIPTS = \	277	config_SCRIPTS = \
278	brp-compress brp-python-bytecompile brp-redhat \	278	brp-compress brp-python-bytecompile brp-redhat \
279	brp-strip brp-strip-comment-note \	279	brp-strip brp-strip-comment-note \

Return to bug 81982

Lines 23477-23485 Link Here

(-)rpm-4.2.1.orig/configure (-4 / +4 lines)
23477	fi	23477	fi
23478		23478
23479	MARK64=	23479	MARK64=
23480	case "${target_cpu}" in	23480	#case "${target_cpu}" in
23481	x86_64\|ppc64\|powerpc64\|sparc64\|s390x*) MARK64=64 ;;	23481	#x86_64\|ppc64\|powerpc64\|sparc64\|s390x*) MARK64=64 ;;
23482	esac	23482	#esac
23483		23483
23484		23484
23485	autorelocate_path='%{nil}'	23485	autorelocate_path='%{nil}'
Lines 23538-23544 Link Here
23538		23538
23539	LIBDIR="`echo $libdir \| sed 's-/lib$-/%{_lib}-'`"	23539	LIBDIR="`echo $libdir \| sed 's-/lib$-/%{_lib}-'`"
23540		23540
23541	RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`"	23541	RPMCONFIGDIR="`echo ${libdir}/rpm`"
23542		23542
23543	cat >>confdefs.h <<_ACEOF	23543	cat >>confdefs.h <<_ACEOF
23544	#define RPMCONFIGDIR "$RPMCONFIGDIR"	23544	#define RPMCONFIGDIR "$RPMCONFIGDIR"