typo

[packages/rpm-build-macros.git] / rpm.macros

diff --git a/rpm.macros b/rpm.macros
index 5e763aba80a3bbecae7e7cc3f9005021069da6f7..3f034b5d33f449bbad613db03d0b272d0ac28a85 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,10 @@ 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 ; \
+ unset LINGUAS || : ; \
  ./configure %{_target_platform} \
        --prefix=%{_prefix} \
        --exec-prefix=%{_exec_prefix} \
@@ -75,8 +76,27 @@ done \
        --sharedstatedir=%{_sharedstatedir} \
        --mandir=%{_mandir} \
        --infodir=%{_infodir} }
-#------------------------------------------------------------------------  
-# usage (in %files)
-# %(%find_lang %{name})
-#
-%find_lang     @RPMCONFIGDIR@/find-lang.sh %{_builddir}
+
+# 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}
+