projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
c++: fix -Wformat
[awesomized/libmemcached]
/
rpm
/
include.mk
diff --git
a/rpm/include.mk
b/rpm/include.mk
index 27b6bd0e89811a3aedac938d7940edfa8e290203..bf9bd1a855c905ed319293d01dd0f1945f89c8ea 100644
(file)
--- a/
rpm/include.mk
+++ b/
rpm/include.mk
@@
-1,9
+1,10
@@
# vim:ft=automake
RPM_BUILDDIR= ~/rpmbuild
# vim:ft=automake
RPM_BUILDDIR= ~/rpmbuild
+RPM_SOURCESDIR= $(RPM_BUILDDIR)/SOURCES
RPM_BUILD_TARGET= @PACKAGE@-@VERSION@-@RPM_RELEASE@.@build_cpu@.rpm
RPM_BUILD_TARGET= @PACKAGE@-@VERSION@-@RPM_RELEASE@.@build_cpu@.rpm
-RPM_SOURCE= $(RPM_
BUILDDIR)/SOURCES
/$(DIST_ARCHIVES)
+RPM_SOURCE= $(RPM_
SOURCESDIR)
/$(DIST_ARCHIVES)
RPMS=
RPMS+= $(RPM_BUILD_TARGET)
RPMS=
RPMS+= $(RPM_BUILD_TARGET)
@@
-24,11
+25,12
@@
$(RPM_BUILDDIR):
$(DIST_ARCHIVES): $(DISTFILES)
$(MAKE) $(AM_MAKEFLAGS) dist-gzip
$(DIST_ARCHIVES): $(DISTFILES)
$(MAKE) $(AM_MAKEFLAGS) dist-gzip
-$(RPM_SOURCE): | $(RPM_BUILDDIR) $(DIST_ARCHIVES)
- @rm -f $(BUILD_RPMS) $(BUILD_SRPMS) $(BUILD_RPM_DIR)
- @cp $(DIST_ARCHIVES) $(RPM_SOURCE)
+$(RPM_SOURCE): $(DIST_ARCHIVES) $(RPM_BUILDDIR)
+ @cp $< $@
$(RPM_BUILD_TARGET): $(RPM_SOURCE) support/@PACKAGE@.spec
$(RPM_BUILD_TARGET): $(RPM_SOURCE) support/@PACKAGE@.spec
+ -@rm -f $(BUILD_RPMS) $(BUILD_SRPMS)
+ -@rm -rf $(BUILD_RPM_DIR)
@@RPMBUILD@ -ba $(top_srcdir)/support/@PACKAGE@.spec
@cp $(BUILD_RPMS) $(BUILD_SRPMS) .
@@RPMBUILD@ -ba $(top_srcdir)/support/@PACKAGE@.spec
@cp $(BUILD_RPMS) $(BUILD_SRPMS) .
@@
-39,7
+41,8
@@
rpm-sign: $(RPM_BUILD_TARGET)
.PHONY: clean-rpm
clean-rpm:
.PHONY: clean-rpm
clean-rpm:
- -@rm -f $(BUILD_RPMS) $(BUILD_SRPMS) $(BUILD_RPM_SOURCE) $(BUILD_RPM_DIR) $(RPM_DIST)
+ -@rm -f $(BUILD_RPMS) $(BUILD_SRPMS) $(BUILD_RPM_SOURCE) $(RPM_DIST)
+ -@rm -rf $(BUILD_RPM_DIR)
rpm: $(RPM_BUILD_TARGET)
dist-rpm: $(RPM_BUILD_TARGET)
rpm: $(RPM_BUILD_TARGET)
dist-rpm: $(RPM_BUILD_TARGET)