- well, -ggdb will be enough

[packages/rpm.git] / rpm.macros

diff --git a/rpm.macros b/rpm.macros
index f1cc633259bd41f77ec6141d91edf19803583622..347300535aba1893e0528adba1314af1c4ff234f 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,18 @@
 #-----------------------------------------------------------------
 # CFLAGS and LDFLAGS used to build
 
+%if %{_enable_debug_packages}%{!?_enable_debug_packages:0}
+%debuginfocflags        -ggdb
+%endif
+
 %debugcflags   -O0 -g -Wall
-%rpmcflags     %{?debug:%debugcflags}%{!?debug:%optflags}
-# %rpmldflags  %{!?debug:-s}
+%rpmcflags     %{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags:%debuginfocflags}
 %rpmldflags    %{nil}
 
 # kernel compiler
 %kgcc          gcc
 %kgcc_package  gcc
 
-# other macros
-%_enable_debug_packages 1
-
 # Build system path macros.
 #
 %__libtoolize           libtoolize --copy --force
@@ -248,8 +251,8 @@ unset DISPLAY ||:\
 #
 #%no_install_post_compress_docs        1
 %__spec_install_post_compress_docs { \
-echo "Compress man and info pages."; \
 %{!?no_install_post_compress_docs: \
+       echo "Compress man and info pages."; \
        %{?verbose:set -x;} \
        for i in /usr/share/man /usr/X11R6/man /usr/share/info; do \
                if [ -d "$RPM_BUILD_ROOT$i" ]; then \
@@ -443,3 +446,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/')