diff options
| author | chak <unknown> | 2000-12-16 06:55:58 +0000 |
|---|---|---|
| committer | chak <unknown> | 2000-12-16 06:55:58 +0000 |
| commit | 16ee51f473e1986c8fc5025a03e895addd99169c (patch) | |
| tree | 187c74c93e92e8eb21197155cf5edae5f159202f /distrib/cvs-build | |
| parent | f05dbea1695542772dc917f33d24525c05a8e09d (diff) | |
| download | haskell-16ee51f473e1986c8fc5025a03e895addd99169c.tar.gz | |
[project @ 2000-12-16 06:55:58 by chak]
Simplified setting of build directory following a suggestion by
Jeff Lewis.
Diffstat (limited to 'distrib/cvs-build')
| -rw-r--r-- | distrib/cvs-build | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/distrib/cvs-build b/distrib/cvs-build index 911589e680..760f224671 100644 --- a/distrib/cvs-build +++ b/distrib/cvs-build @@ -119,25 +119,10 @@ cd $BUILD_DIR tar -cz -f $BUILD_DIR/SOURCES/ghc-$VERSION-src.tar.gz fptools || exit 1 rm -rf $BUILD_DIR/fptools -# set up the configuration for rpm -# -# * !!! this is not really elegant - any better idea? -# -our_rcfile=$BUILD_DIR/rpmrc -our_macrofile=$BUILD_DIR/rpmmacros -cat >$our_rcfile <<END -macrofiles: /usr/lib/rpm/macros:/usr/lib/rpm/%{_target}/macros:/etc/rpm/macros:/etc/rpm/%{_target}/macros:~/.rpmmacros:$our_macrofile -END - -cat >$our_macrofile <<END -%_topdir $BUILD_DIR -END - # Build packages with rpm # echo "*** Building packages..." -rcfiles=/usr/lib/rpm/rpmrc:$our_rcfile -rpm --rcfile "$rcfiles" -ba SPEC/ghc-${VERSION}.spec || exit 1 +rpm --define "_topdir $BUILD_DIR" -ba SPEC/ghc-${VERSION}.spec || exit 1 echo "*** ...made the packages" # Cleaning up |