diff options
| author | Michael E Brown <mebrown@michaels-house.net> | 2007-12-04 09:21:33 -0600 |
|---|---|---|
| committer | Michael E Brown <mebrown@michaels-house.net> | 2007-12-04 09:21:33 -0600 |
| commit | e1d2de8c53bd0f39e1efb9ca6c95d454552123b0 (patch) | |
| tree | e6d5caba09e0cd55086bace49ef7ef132081a076 | |
| parent | 68ca35d7efc302200a617f9bddf0979be92a85b1 (diff) | |
| download | mock-e1d2de8c53bd0f39e1efb9ca6c95d454552123b0.tar.gz mock-e1d2de8c53bd0f39e1efb9ca6c95d454552123b0.tar.xz mock-e1d2de8c53bd0f39e1efb9ca6c95d454552123b0.zip | |
better rpmbuild, more specific defs for std rpmbuild options. original patch from Todd Zullinger (tmz). Fixups by me.
| -rw-r--r-- | Makefile.am | 32 | ||||
| -rw-r--r-- | Makefile.in | 30 |
2 files changed, 39 insertions, 23 deletions
diff --git a/Makefile.am b/Makefile.am index e4ab2cd..024f221 100644 --- a/Makefile.am +++ b/Makefile.am @@ -70,19 +70,27 @@ install-exec-hook: perl -p -i -e 's|^LIBDIR =.*|PKGDATADIR="$(libdir)"|' $$file ;\ done +TOPDIR := $(shell cd $(top_builddir);pwd) +BUILDDIR = $(TOPDIR)/_rpmbuild +RPMDIR = $(TOPDIR) +SOURCEDIR = $(TOPDIR) +SPECDIR = $(TOPDIR) +SRCRPMDIR = $(TOPDIR) + +RPM_DEFINES = --define "_topdir $(TOPDIR)" \ + --define "_builddir $(BUILDDIR)" \ + --define "_rpmdir $(RPMDIR)" \ + --define "_sourcedir $(SOURCEDIR)" \ + --define "_specdir $(SPECDIR)" \ + --define "_srcrpmdir $(SRCRPMDIR)" + .PHONY: rpm srpm rpm: dist - BLD_DIR=$$(mktemp -d /tmp/rpmbuild-$$$$-XXXXXX); \ - mkdir -p $$BLD_DIR/SOURCES $$BLD_DIR/BUILD $$BLD_DIR/RPMS $$BLD_DIR/RPMS/i386 $$BLD_DIR/RPMS/noarch $$BLD_DIR/SRPMS $$BLD_DIR/SPECS ;\ - rpmbuild --define "_topdir $$BLD_DIR" -ta --nodeps $(RELEASE_STRING).tar.gz ;\ - cp $$BLD_DIR/SRPMS/*rpm . ;\ - cp $$BLD_DIR/RPMS/*/*rpm . ;\ - rm -rf $$BLD_DIR + mkdir -p $(BUILDDIR) + rpmbuild $(RPM_DEFINES) -ba --nodeps $(PACKAGE_NAME).spec + rm -rf $(BUILDDIR) srpm: dist - BLD_DIR=$$(mktemp -d /tmp/rpmbuild-$$$$-XXXXXX); \ - mkdir -p $$BLD_DIR/SOURCES $$BLD_DIR/BUILD $$BLD_DIR/RPMS $$BLD_DIR/RPMS/i386 $$BLD_DIR/RPMS/noarch $$BLD_DIR/SRPMS $$BLD_DIR/SPECS ;\ - rpmbuild --define "_topdir $$BLD_DIR" -ts --nodeps $(RELEASE_STRING).tar.gz ;\ - cp $$BLD_DIR/SRPMS/*rpm . ;\ - rm -rf $$BLD_DIR - + mkdir -p $(BUILDDIR) + rpmbuild $(RPM_DEFINES) -ba --nodeps $(PACKAGE_NAME).spec + rm -rf $(BUILDDIR) diff --git a/Makefile.in b/Makefile.in index 7d71d2a..42dcc6b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -284,6 +284,19 @@ pkgpython_PYTHON = \ py/mock/uid.py REPLACE_VARS_ON_INSTALL = $(libexecdir)/mock.py +TOPDIR := $(shell cd $(top_builddir);pwd) +BUILDDIR = $(TOPDIR)/_rpmbuild +RPMDIR = $(TOPDIR) +SOURCEDIR = $(TOPDIR) +SPECDIR = $(TOPDIR) +SRCRPMDIR = $(TOPDIR) +RPM_DEFINES = --define "_topdir $(TOPDIR)" \ + --define "_builddir $(BUILDDIR)" \ + --define "_rpmdir $(RPMDIR)" \ + --define "_sourcedir $(SOURCEDIR)" \ + --define "_specdir $(SPECDIR)" \ + --define "_srcrpmdir $(SRCRPMDIR)" + all: all-recursive .SUFFIXES: @@ -992,19 +1005,14 @@ install-exec-hook: .PHONY: rpm srpm rpm: dist - BLD_DIR=$$(mktemp -d /tmp/rpmbuild-$$$$-XXXXXX); \ - mkdir -p $$BLD_DIR/SOURCES $$BLD_DIR/BUILD $$BLD_DIR/RPMS $$BLD_DIR/RPMS/i386 $$BLD_DIR/RPMS/noarch $$BLD_DIR/SRPMS $$BLD_DIR/SPECS ;\ - rpmbuild --define "_topdir $$BLD_DIR" -ta --nodeps $(RELEASE_STRING).tar.gz ;\ - cp $$BLD_DIR/SRPMS/*rpm . ;\ - cp $$BLD_DIR/RPMS/*/*rpm . ;\ - rm -rf $$BLD_DIR + mkdir -p $(BUILDDIR) + rpmbuild $(RPM_DEFINES) -ba --nodeps $(PACKAGE_NAME).spec + rm -rf $(BUILDDIR) srpm: dist - BLD_DIR=$$(mktemp -d /tmp/rpmbuild-$$$$-XXXXXX); \ - mkdir -p $$BLD_DIR/SOURCES $$BLD_DIR/BUILD $$BLD_DIR/RPMS $$BLD_DIR/RPMS/i386 $$BLD_DIR/RPMS/noarch $$BLD_DIR/SRPMS $$BLD_DIR/SPECS ;\ - rpmbuild --define "_topdir $$BLD_DIR" -ts --nodeps $(RELEASE_STRING).tar.gz ;\ - cp $$BLD_DIR/SRPMS/*rpm . ;\ - rm -rf $$BLD_DIR + mkdir -p $(BUILDDIR) + rpmbuild $(RPM_DEFINES) -ba --nodeps $(PACKAGE_NAME).spec + rm -rf $(BUILDDIR) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: |