- removed %%include /usr/lib/rpm/macros.python

[packages/rpm.git] / rpm.macros

diff --git a/rpm.macros b/rpm.macros
index 1190669dd6ddfc088bdb560f5a344c7c2aa53f5b..0ab242df825e790670219ca3856047351230044e 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -1,5 +1,8 @@
 # PLD rpm macros
 
+# other macros
+%_enable_debug_packages 1
+
 %__id          @__ID@
 %__id_u                %{__id} -u 
 %__chown_Rhf           @__CHOWN_RHF@
@@ -12,18 +15,16 @@
 #-----------------------------------------------------------------
 # CFLAGS and LDFLAGS used to build
 
+%debuginfocflags       %{expand:%%define dic_%{_enable_debug_packages} %{_enable_debug_packages}}%{?dic_1: -ggdb}%{expand:%%undefine dic_%{_enable_debug_packages}}
+
 %debugcflags   -O0 -g -Wall
-%rpmcflags     %{?debug:%debugcflags}%{!?debug:%optflags}
-# %rpmldflags  %{!?debug:-s}
+%rpmcflags     %{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags}
 %rpmldflags    %{nil}
 
 # kernel compiler
 %kgcc          gcc
 %kgcc_package  gcc
 
-# other macros
-%_enable_debug_packages 1
-
 # Build system path macros.
 #
 %__libtoolize           libtoolize --copy --force
@@ -443,3 +444,4 @@ fi; \
 %xmms_effect_plugindir        %(xmms-config --effect-plugin-dir)
 %xmms_general_plugindir       %(xmms-config --general-plugin-dir)
 
+%_target_base_arch     %(echo %{_target_cpu} | sed 's/i.86/i386/;s/athlon/i386/;s/pentium./i386/;s/amd64/x86_64/')