diff options
| author | Steven Knight <knight@baldmt.com> | 2003-08-05 12:16:54 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2003-08-05 12:16:54 (GMT) |
| commit | 2e861a0422e5330249e360b5098b3ad00d26b5e9 (patch) | |
| tree | 2445339c40ccd04c4813b6cf16dbddfad1c7f01b | |
| parent | 3af5f2686768cb67ab051bc2b585445814dd55ed (diff) | |
| download | SCons-2e861a0422e5330249e360b5098b3ad00d26b5e9.zip SCons-2e861a0422e5330249e360b5098b3ad00d26b5e9.tar.gz SCons-2e861a0422e5330249e360b5098b3ad00d26b5e9.tar.bz2 | |
Make how we build our .rpm packages not depend on the default installation locations from the distutils being used.
| -rw-r--r-- | SConstruct | 1 | ||||
| -rw-r--r-- | rpm/scons.spec.in | 2 | ||||
| -rw-r--r-- | src/CHANGES.txt | 3 |
3 files changed, 5 insertions, 1 deletions
@@ -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 a276af7..d5a4201 100644 --- 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 fd84cd5..74b537c 100644 --- 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 |