X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=macros.pld.in;h=bafd6aab5148eed7aa8baa0398f82da0e6a29c60;hb=badae32f5122b2dc071ae7f2241d9cac9bf97590;hp=45789be05389b67c900b82dd5f2fd44293d46610;hpb=e0cea210c2662a17a4db9d57ddc76b9c3ca83016;p=packages%2Frpm.git

diff --git a/macros.pld.in b/macros.pld.in
index 45789be..bafd6aa 100644
--- a/macros.pld.in
+++ b/macros.pld.in
@@ -30,7 +30,6 @@
 %_sysconfdir		%{_prefix}/etc
 %_sharedstatedir	/var/lib
 %_localstatedir		/var
-%_lib			lib
 %_libdir		%{_exec_prefix}/%{_lib}
 %_includedir		%{_prefix}/include
 %_oldincludedir		/usr/include
@@ -47,12 +46,12 @@
 %__compress_doc		@prefix@/lib/rpm/compress-doc%{?_noautocompressdoc: --noautocompressdoc='%{_noautocompressdoc}'}
 
 %__os_install_post \
-%ifnarch noarch\
+%{?ifnarch noarch:\
 %{__spec_install_post_strip}\
 %{__spec_install_post_chrpath}\
 %{__spec_install_post_compress_modules}\
-%endif\
 %{__spec_install_post_check_so}\
+%endif}\
 %{__spec_install_post_check_tmpfiles}\
 %{__spec_install_post_compress_docs}\
 %{__spec_install_post_py_hardlink}\
@@ -60,10 +59,15 @@
 %{__arch_install_post}\
 %{nil}
 
+%__spec_install_post\
+%{expand:%%define __sip_%{?_enable_debug_packages} 1}%{?__sip_1:%{?__debug_package:%{__debug_install_post}}}%{expand:%%undefine __sip_%{?_enable_debug_packages}}\
+%{__arch_install_post}\
+%{__os_install_post}\
+%{nil}
+
 #---------------------------------------------------------------------
 #	Template for debug information sub-package.
 %_enable_debug_packages		1
-%{expand:%%define __sip_%{?_enable_debug_packages} 1}%{?__sip_1:%{?__debug_package:%{__debug_install_post}}}%{expand:%%undefine __sip_%{?_enable_debug_packages}}\
 
 %debug_package \
 %ifnarch noarch\
@@ -90,6 +94,11 @@ pakietu oraz przy odpluskwianiu samego pakietu.\
 #---------------------------------------------------------------------
 # Overwrite RPM macros with PLD specific one here.
 
+%__grep			/bin/grep
+%__lua			%{_bindir}/lua
+%__rc			%{_bindir}/rc
+%__xar			%{_bindir}/xar
+
 %_tmppath		%(echo "${TMPDIR:-/var/tmp}")
 %tmpdir			%{_tmppath}
 
@@ -122,10 +131,26 @@ pakietu oraz przy odpluskwianiu samego pakietu.\
 
 # Warning: those macros are overwritten by macros.build,
 #          left here for compatibility
-%rpmcflags	%{nil}
-%rpmcxxflags	%{nil}
-%rpmldflags	%{nil}
-%rpmcppflags	%{nil}
+%rpmcflags %(awk 'BEGIN {
+       split("%{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags}",I);
+       split("%{?filterout} %{?filterout_c} %{?filterout_ld}",F);
+       %{filter_out}
+}')
+%rpmcppflags       %(awk 'BEGIN {
+       split("%{?debug:%debugcppflags}%{!?debug:%optcppflags}%{?debuginfocppflags}",I);
+       split("%{?filterout} %{?filterout_cpp} %{?filterout_cpp}",F);
+       %{filter_out}
+}')
+%rpmcxxflags       %(awk 'BEGIN {
+       split("%{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags}",I);
+       split("%{?filterout} %{?filterout_cxx} %{?filterout_ld}",F);
+       %{filter_out}
+}')
+%rpmldflags        %(awk 'BEGIN {
+       split("%{?optldflags}",I);
+       split("%{?filterout_ld}",F)
+       %{filter_out}
+}')
 
 # common compilation flags
 %_fortify_cflags	-Wp,-D_FORTIFY_SOURCE=2
@@ -135,7 +160,7 @@ pakietu oraz przy odpluskwianiu samego pakietu.\
 
 %_ssp_cflags		-fstack-protector --param=ssp-buffer-size=4
 %__common_cflags	-O2 -fwrapv %{debuginfocflags} -pipe %{Werror_cflags} %{?_fortify_cflags}
-%__common_cflags_with_ssp	%{__common_cflags} %{?_ssp_cflags} %{!?nospecflags:%{?specflags}}}
+%__common_cflags_with_ssp	%{__common_cflags} %{?_ssp_cflags} %{!?nospecflags:%{?specflags}}
 
 # arch macros
 %ix86  i386 i486 i586 i686 pentium3 pentium4 athlon