Make how we build our .rpm packages not depend on the default installation locations...

git-svn-id: http://scons.tigris.org/svn/scons/trunk@761 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/SConstruct b/SConstruct
index 0c058592a16d31c5e3e2f4476e9fb2c3bb1c338c..b59c472ffc537126b2461e3c3e61ed433c99190b 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -699,6 +699,7 @@ for p in [ scons ]:
         rpm_spec_env.Command(specfile, specfile_in, rpm_spec_action)
 
         env.InstallAs(sourcefile, tar_gz)
+        Local(sourcefile)
 
         targets = [ noarch_rpm, src_rpm ]
         cmd = "$RPMBUILD --define '_topdir $(%s$)' -ba $SOURCES" % topdir

diff --git a/rpm/scons.spec.in b/rpm/scons.spec.in
index a276af7d53c6a0209fca4f8b26135f6af2de970f..d5a4201fd432d740777686e1c49710e7e6d9efc1 100644 (file)
--- a/rpm/scons.spec.in
+++ b/rpm/scons.spec.in
@@ -40,7 +40,7 @@ defined Builder and/or Scanner objects.
 python setup.py build
 
 %install
-python setup.py install --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
+python setup.py install --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES --install-lib=/usr/lib/scons --install-scripts=/usr/bin
 mkdir -p $RPM_BUILD_ROOT/usr/man/man1
 gzip -c scons.1 > $RPM_BUILD_ROOT/usr/man/man1/scons.1.gz
 gzip -c sconsign.1 > $RPM_BUILD_ROOT/usr/man/man1/sconsign.1.gz

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index fd84cd5ccc761058bc0e85654b826314be5ade82..74b537c4866665c96225ab1a7eb67cec0019b63e 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -83,6 +83,9 @@ RELEASE 0.XX - XXX
   - Support a MAXLINELINELENGTH construction variable on Win32 systems
     to control when a temporary file is used for long command lines.
 
+  - Make how we build .rpm packages not depend on the installation
+    locations from the distutils being used.
+
   From Gary Oberbrunner:
 
   - Report the target being built in error messages when building