Sync with rpm-4_0 branch.

CVS patchset: 5048
CVS date: 2001/09/15 13:49:11

1 files changed, 26 insertions, 42 deletions

diff --git a/macros.in b/macros.in
index c225c1a74..16e1a6139 100644
--- a/macros.in
+++ b/macros.in
@@ -1,7 +1,7 @@
 #/*! \page config_macros Default configuration: /usr/lib/rpm/macros
 # \verbatim
 #
-# $Id: macros.in,v 1.87 2001/07/31 18:13:23 jbj Exp $
+# $Id: macros.in,v 1.88 2001/09/15 13:49:11 jbj Exp $
 #
 # This is a global RPM configuration file. All changes made here will
 # be lost when the rpm package is upgraded. Any per-system configuration
@@ -500,45 +500,29 @@
 # ---- Scriptlet template templates.
 #	Global defaults used for building scriptlet templates.
 #
-# XXX legacy configuration, use ___build_pre et al instead.
-#%_preScriptEnvironment	\
-#RPM_SOURCE_DIR=\"%{_sourcedir}\"\
-#RPM_BUILD_DIR=\"%{_builddir}\"\
-#RPM_OPT_FLAGS=\"%{optflags}\"\
-#RPM_ARCH=\"%{_arch}\"\
-#RPM_OS=\"%{_os}\"\
-#export RPM_SOURCE_DIR RPM_BUILD_DIR RPM_OPT_FLAGS RPM_ARCH RPM_OS\
-#RPM_DOC_DIR=\"%{_docdir}\"\
-#export RPM_DOC_DIR\
-#RPM_PACKAGE_NAME=\"%{name}\"\
-#RPM_PACKAGE_VERSION=\"%{version}\"\
-#RPM_PACKAGE_RELEASE=\"%{release}\"\
-#export RPM_PACKAGE_NAME RPM_PACKAGE_VERSION RPM_PACKAGE_RELEASE\
-#%{?buildroot:RPM_BUILD_ROOT=\"%{buildroot}\"\
-#export RPM_BUILD_ROOT}
 
 %___build_shell		%{?_buildshell:%{_buildshell}}%{!?_buildshell:/bin/sh}
 %___build_args		-e
 %___build_cmd		%{?_sudo:%{_sudo} }%{?_remsh:%{_remsh} %{_remhost} }%{?_remsudo:%{_remsudo} }%{?_remchroot:%{_remchroot} %{_remroot} }%{___build_shell} %{___build_args}
 %___build_pre	\
-RPM_SOURCE_DIR=\"%{u2p:%{_sourcedir}}\"\
-RPM_BUILD_DIR=\"%{u2p:%{_builddir}}\"\
-RPM_OPT_FLAGS=\"%{optflags}\"\
-RPM_ARCH=\"%{_arch}\"\
-RPM_OS=\"%{_os}\"\
-export RPM_SOURCE_DIR RPM_BUILD_DIR RPM_OPT_FLAGS RPM_ARCH RPM_OS\
-RPM_DOC_DIR=\"%{_docdir}\"\
-export RPM_DOC_DIR\
-RPM_PACKAGE_NAME=\"%{name}\"\
-RPM_PACKAGE_VERSION=\"%{version}\"\
-RPM_PACKAGE_RELEASE=\"%{release}\"\
-export RPM_PACKAGE_NAME RPM_PACKAGE_VERSION RPM_PACKAGE_RELEASE\
-%{?buildroot:RPM_BUILD_ROOT=\"%{u2p:%{buildroot}}\"\
-export RPM_BUILD_ROOT}\
-\
-%{verbose:set -x}%{!verbose:exec > /dev/null}\
-umask 022\
-cd %{u2p:%{_builddir}}\
+  RPM_SOURCE_DIR=\"%{u2p:%{_sourcedir}}\"\
+  RPM_BUILD_DIR=\"%{u2p:%{_builddir}}\"\
+  RPM_OPT_FLAGS=\"%{optflags}\"\
+  RPM_ARCH=\"%{_arch}\"\
+  RPM_OS=\"%{_os}\"\
+  export RPM_SOURCE_DIR RPM_BUILD_DIR RPM_OPT_FLAGS RPM_ARCH RPM_OS\
+  RPM_DOC_DIR=\"%{_docdir}\"\
+  export RPM_DOC_DIR\
+  RPM_PACKAGE_NAME=\"%{name}\"\
+  RPM_PACKAGE_VERSION=\"%{version}\"\
+  RPM_PACKAGE_RELEASE=\"%{release}\"\
+  export RPM_PACKAGE_NAME RPM_PACKAGE_VERSION RPM_PACKAGE_RELEASE\
+  %{?buildroot:RPM_BUILD_ROOT=\"%{u2p:%{buildroot}}\"\
+  export RPM_BUILD_ROOT}\
+  \
+  %{verbose:set -x}%{!verbose:exec > /dev/null}\
+  umask 022\
+  cd %{u2p:%{_builddir}}\
 
 
 #%___build_body		%{nil}
@@ -721,11 +705,11 @@ cd %{u2p:%{_builddir}}\
 #------------------------------------------------------------------------------
 # This is an improved version of %configure (from PLD team).
 %configure \
-CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
-CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
-FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
-%{?__libtoolize:[ -f configure.in ] && %{__libtoolize} --copy --force ;} \
-./configure \\\
+  CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
+  CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
+  FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
+  %{?__libtoolize:[ -f configure.in ] && %{__libtoolize} --copy --force ;} \
+  ./configure \\\
 	%{?_gnu: --host=%{_host} --target=%{_target_platform}} \\\
 	%{!?_gnu: %{_target_platform}} \\\
  	--prefix=%{_prefix} \\\
@@ -745,7 +729,7 @@ FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
 #------------------------------------------------------------------------------
 # The make install analogue of %configure:
 %makeinstall \
-   make \\\
+  make \\\
 	prefix=%{?buildroot:%{buildroot}}%{_prefix} \\\
 	exec_prefix=%{?buildroot:%{buildroot}}%{_exec_prefix} \\\
 	bindir=%{?buildroot:%{buildroot}}%{_bindir} \\\
@@ -759,7 +743,7 @@ FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
 	sharedstatedir=%{?buildroot:%{buildroot}}%{_sharedstatedir} \\\
 	mandir=%{?buildroot:%{buildroot}}%{_mandir} \\\
 	infodir=%{?buildroot:%{buildroot}}%{_infodir} \\\
-   install
+  install
 
 #------------------------------------------------------------------------------
 # The GNUconfigure macro does the following: