on AXP find-provides requires file >= 3.31

[packages/rpm.git] / rpm.macros

diff --git a/rpm.macros b/rpm.macros
index 2150f28a4e0e1fef39fc4fd19a3157c56a151e74..c845d02654fb096a31a5f8ffc39eae3a2960ee3d 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -12,8 +12,8 @@
 # Based on autogen.sh from GNOME and orginal GNUconfigure
 #
 %GNUconfigure(MCs:)      \
-  CFLAGS="${CFLAGS} %{optflags}" ; export CFLAGS; \
-  LDFLAGS="${LDFLAGS} %{-s:-s}"  ; export LDFLAGS; \
+  CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS; \
+  LDFLAGS="${LDFLAGS:-'%{-s:-s}'}"  ; export LDFLAGS; \
   %{-C:_mydir="`pwd`"; %{-M: %{__mkdir} -p %{-C*};} cd %{-C*}} \
   dirs="`find ${_mydir} -name configure.in -print`"; export dirs; \
     for coin in `echo ${dirs}` \
@@ -58,9 +58,9 @@ done \
   %{-C:cd ${_mydir}; unset _mydir}
 
 #-----------------------------------------------------------------
-%configure { CFLAGS="$CFLAGS $RPM_OPT_FLAGS" ; export CFLAGS ; \
- CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS" ; export CXXFLAGS ; \
- FFLAGS="$FFLAGS $RPM_OPT_FLAGS" ; export FFLAGS ; \
+%configure { CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
+ CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
+ FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
  ./configure %{_target_platform} \
        --prefix=%{_prefix} \
        --exec-prefix=%{_exec_prefix} \
@@ -75,13 +75,27 @@ done \
        --sharedstatedir=%{_sharedstatedir} \
        --mandir=%{_mandir} \
        --infodir=%{_infodir} }
-#------------------------------------------------------------------------  
-# usage 
-# (in %install)
-# %find_lang %{name}
-#
-# %file -f %{name}.lang
-#
 
-%find_lang     @RPMCONFIGDIR@/find-lang.sh %{buildroot}
+# Location of autoconf macros
+%_aclocaldir   %(aclocal --print-ac-dir)
+
+# Fixed location of top applink dir
+%_applnkdir      /usr/X11R6/share/applnk
+
+# Current date
+%date          %(LC_ALL="C" date +"%a %b %d %Y")
+
+# tmp directory
+%tmpdir                %(echo "${TMPDIR:-/tmp}")
+
+# Example files, programs, scripts...
+%_examplesdir  /usr/src/examples
+
+# Find-requires and directories excluded from auto-req
+%_noautoreqdir         %{_defaultdocdir} %{_examplesdir}
+%_noautoreqdep         %{nil}
+#%__find_requires_pre  /usr/lib/rpm/find-requires-pre %{_noautoreqdir}
+#%__find_requires_core /usr/lib/rpm/find-requires
+#%__find_requires_post /usr/lib/rpm/find-requires-post
+#%__find_requires      %{__find_requires_pre} | %{__find_requires_core} | %{__find_requires_post}