summaryrefslogtreecommitdiffstats
path: root/Makefile.in
diff options
context:
space:
mode:
authorAmeya Palande <2ameya@gmail.com>2010-03-18 22:03:24 +0200
committerSimon Horman <horms@verge.net.au>2010-03-24 22:29:00 +1100
commit529ad47e356a8e68be9cde771af8e909a784c3fc (patch)
tree424caddc60bc0150483d221901460a45ad7d7d21 /Makefile.in
parentc17b20d49385404851c0f75f0a666813aa8c6f1f (diff)
downloadkexec-tools-529ad47e356a8e68be9cde771af8e909a784c3fc.tar.gz
kexec-tools: Use default rpmbuild definations
Since current mechanism for building rpm into custom directory is not working, remove it and switch to system defaults for rpmbuild. Signed-off-by: Ameya Palande <ameya.palande@nokia.com> Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in16
1 files changed, 3 insertions, 13 deletions
diff --git a/Makefile.in b/Makefile.in
index 256f4de0..cc4f8d31 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -200,19 +200,9 @@ $(TARBALL): $(SRCS) $(GENERATED_SRCS)
$(TARBALL.gz): $(TARBALL)
gzip -c < $^ > $@
-RPMDIR=rpm
rpm: $(TARBALL.gz)
- $(MKDIR) -p $(RPMDIR)/RPM $(RPMDIR)/SRPM $(RPMDIR)/BUILD \
- $(RPMDIR)/SPECS $(RPMDIR)/TMP $(RPMDIR)/SOURCES
- unset MAKEFLAGS MAKELEVEL; \
- $(RPMBUILD) -ta \
- --define '_rpmdir $(RPMDIR)/RPM' \
- --define '_srcrpmdir $(RPMDIR)/SRPM' \
- --define '_builddir $(RPMDIR)/BUILD' \
- --define '_specdir $(RPMDIR)/SPECS' \
- --define '_tmppath $(RPMDIR)/TMP' \
- --define '_sourcedir $(RPMDIR)/SOURCES' \
- $(TARBALL.gz)
+ unset MAKEFLAGS MAKELEVEL;
+ $(RPMBUILD) -ta $(TARBALL.gz)
$(SPEC): kexec-tools.spec.in Makefile
$(SED) -e 's,^Version: $$,Version: $(PACKAGE_VERSION),' $< > $@
@@ -227,7 +217,7 @@ echo::
clean:
$(RM) -f $(clean)
- $(RM) -rf rpm build
+ $(RM) -rf build
$(RM) -f $(TARBALL) $(TARBALL.gz)
distclean: dist-clean