diff options
| author | Lee Thompson <stagr.lee@gmail.com> | 2013-02-02 23:50:43 -0600 |
|---|---|---|
| committer | Lee Thompson <stagr.lee@gmail.com> | 2013-02-02 23:50:43 -0600 |
| commit | 0370d5b526d58e811b967b170102e7bc2f6219d2 (patch) | |
| tree | baed82282e7ac2dc4c4eceaaf6aa4149fad8c0c1 | |
| parent | 52f906ab43e342002d675c6041ee7d1bca142baf (diff) | |
fix RPM build process
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | jq.spec | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 7bdc53ef..bb5133bf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -99,7 +99,7 @@ rpm: jq jq_test @echo "Packaging jq as an RPM ..." mkdir -p rpm/SOURCES rpm/BUILD rpm/BUILDROOT rpm/RPMS rpm/SPECS cp jq-$$(cat VERSION).tar.gz rpm/SOURCES/ - rpmbuild -tb --define "_topdir ${PWD}/rpm" --define "_prefix ${HOME}" --define "version $$(cat VERSION)" --define "release ${RELEASE}" rpm/SOURCES/jq-$$(cat VERSION).tar.gz + rpmbuild -tb --define "_topdir ${PWD}/rpm" --define "_prefix /usr" --define "version $$(cat VERSION)" --define "release ${RELEASE}" rpm/SOURCES/jq-$$(cat VERSION).tar.gz find rpm/RPMS/ -name "*.rpm" -exec mv {} ./ \; rm -rf rpm @@ -31,11 +31,11 @@ echo "Building in: \"$(pwd)\"" make %install -echo "Installing to: \"${_buildroot}\"" -make install DESTDIR=${_buildroot} +echo "Installing to: \"%{buildroot}\"" +make install DESTDIR=%{buildroot} %clean -rm -rf ${_buildroot} +rm -rf %{buildroot} %files %defattr(-,root,root) |