avatar
mikhailnov has added d642081cb2
Forward compatibility with macros from rpm4 in rosa2019.1+ (1)
view file @ d642081cb2
... ... --- a/macros/mandriva.in
... ... +++ b/macros/mandriva.in
... ... @@ -377,29 +377,6 @@ GCONF_CONFIG_SOURCE=`%{_gconftool_bin} --get-default-source` %{_gconftool_bin} -
377 377
  %{__fix_libtool_from_moving_options_after_libs} $CONFIGURE_TOP ; \
378 378
  %{__fix_dlsearch_path_in_libtool_for_multilib} $CONFIGURE_TOP %{_lib}
379 379
380
# This is an improved version of %configure (from PLD team).
381
%configure \
382
  %before_configure ; \
383
  %{?!_disable_libtoolize:%{?__libtoolize_configure:%{__libtoolize_configure};}} \
384
  [ -f $CONFIGURE_TOP/configure.in -o -f $CONFIGURE_TOP/configure.ac ] && \
385
  CONFIGURE_XPATH="--x-includes=%{_prefix}/include --x-libraries=%{_prefix}/%{_lib}" \
386
  $CONFIGURE_TOP/configure %{_target_platform} \\\
387
	--program-prefix=%{?_program_prefix} \\\
388
 	--prefix=%{_prefix} \\\
389
	--exec-prefix=%{_exec_prefix} \\\
390
	--bindir=%{_bindir} \\\
391
	--sbindir=%{_sbindir} \\\
392
	--sysconfdir=%{_sysconfdir} \\\
393
	--datadir=%{_datadir} \\\
394
	--includedir=%{_includedir} \\\
395
	--libdir=%{_libdir} \\\
396
	--libexecdir=%{_libexecdir} \\\
397
	--localstatedir=%{_localstatedir} \\\
398
	--sharedstatedir=%{_sharedstatedir} \\\
399
	--mandir=%{_mandir} \\\
400
	--infodir=%{_infodir} \\\
401
    $CONFIGURE_XPATH
402
403 380
%configure2_5x \
404 381
  %before_configure ; \
405 382
  %{?_enable_libtoolize:%{?__libtoolize_configure:%{__libtoolize_configure};}} \
... ... @@ -421,6 +398,8 @@ GCONF_CONFIG_SOURCE=`%{_gconftool_bin} --get-default-source` %{_gconftool_bin} -
398 398
	--infodir=%{_infodir} \\\
399 399
    $CONFIGURE_XPATH
400 400
401
%configure %configure2_5x
402
401 403
402 404
%old_makeinstall \
403 405
    make \\\
... ... @@ -513,3 +492,13 @@ Internationalization and locale data for %{?1:%{1}}%{?!1:%{name}}\
492 492
493 493
# https://forum.rosalinux.ru/viewtopic.php?f=56&t=8427&p=88972&hilit=rpm4+rpm5#p88972
494 494
%__nofsync nofsync
495
496
497
### Forward compatibility with macros from rpm4 in rosa2019.1+
498
%make_build %make
499
%make_install %makeinstall_std
500
%set_build_flags %setup_compile_flags
501
%build_ldflags %ldflags
502
%build_cflags %{optflags}
503
%build_cxxflags %{optflags}
504
%build_fflags %{optflags}

Comments