aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Thauvin <nanardon@mandriva.org>2006-05-20 12:32:56 +0000
committerOlivier Thauvin <nanardon@mandriva.org>2006-05-20 12:32:56 +0000
commitb17e090c4362ad19d5987639a5c87f2a2e7b3ed8 (patch)
treeed382f96b8043ea05c1544890e5511aca5272f44
parentc333aebcb45e7609dcbe5c95c2659b80bc49254c (diff)
downloadrpm-setup-b17e090c4362ad19d5987639a5c87f2a2e7b3ed8.tar
rpm-setup-b17e090c4362ad19d5987639a5c87f2a2e7b3ed8.tar.gz
rpm-setup-b17e090c4362ad19d5987639a5c87f2a2e7b3ed8.tar.bz2
rpm-setup-b17e090c4362ad19d5987639a5c87f2a2e7b3ed8.tar.xz
rpm-setup-b17e090c4362ad19d5987639a5c87f2a2e7b3ed8.zip
- remove X11R6/ dir since xorg7 deprecated it
-rw-r--r--macros.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/macros.in b/macros.in
index 416a482..f2b1844 100644
--- a/macros.in
+++ b/macros.in
@@ -413,7 +413,7 @@
%{?__cputoolize:%{__cputoolize} -c $CONFIGURE_TOP} ; \
%{?__libtoolize:(cd $CONFIGURE_TOP; [ -f configure.in -o -f configure.ac ] && %{__libtoolize} --copy --force)} ; \
[ -f $CONFIGURE_TOP/configure.in -o -f $CONFIGURE_TOP/configure.ac ] && \
- CONFIGURE_XPATH="--x-includes=%{_prefix}/X11R6/include --x-libraries=%{_prefix}/X11R6/%{_lib}" \
+ CONFIGURE_XPATH="--x-includes=%{_prefix}/include --x-libraries=%{_prefix}/%{_lib}" \
$CONFIGURE_TOP/configure %{_target_platform} \\\
--program-prefix=%{?_program_prefix} \\\
--prefix=%{_prefix} \\\
@@ -439,7 +439,7 @@
%{?__cputoolize:%{__cputoolize} -c $CONFIGURE_TOP} ; \
%{?__libtoolize:(cd $CONFIGURE_TOP; [ -f configure.in -o -f configure.ac ] && %{__libtoolize} --copy --force)} ; \
[ -f $CONFIGURE_TOP/configure.in -o -f $CONFIGURE_TOP/configure.ac ] && \
- CONFIGURE_XPATH="--x-includes=%{_prefix}/X11R6/include --x-libraries=%{_prefix}/X11R6/%{_lib}" \
+ CONFIGURE_XPATH="--x-includes=%{_prefix}/include --x-libraries=%{_prefix}/%{_lib}" \
$CONFIGURE_TOP/configure --build=%{_target_platform} \\\
--prefix=%{_prefix} \\\
--exec-prefix=%{_exec_prefix} \\\