From: Brian Aker <brian@tangent.org>
Date: Sun, 9 Feb 2014 12:19:48 +0000 (-0800)
Subject: Merge from template.
X-Git-Tag: pre_cmake~98^2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=30f2a0f97e193f632c64205abe83abca7ed08ee7;p=m6w6%2Flibmemcached

Merge from template.
---

diff --git a/rpm/include.mk b/rpm/include.mk
index e6916459..bf9bd1a8 100644
--- a/rpm/include.mk
+++ b/rpm/include.mk
@@ -1,9 +1,10 @@
 # vim:ft=automake
 
 RPM_BUILDDIR= ~/rpmbuild
+RPM_SOURCESDIR= $(RPM_BUILDDIR)/SOURCES
 
 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)
@@ -24,8 +25,8 @@ $(RPM_BUILDDIR):
 $(DIST_ARCHIVES): $(DISTFILES)
 	$(MAKE) $(AM_MAKEFLAGS) dist-gzip
 
-$(RPM_SOURCE): | $(RPM_BUILDDIR) $(DIST_ARCHIVES)
-	@cp $(DIST_ARCHIVES) $(RPM_SOURCE)
+$(RPM_SOURCE): $(DIST_ARCHIVES) $(RPM_BUILDDIR)
+	@cp $< $@
 
 $(RPM_BUILD_TARGET): $(RPM_SOURCE) support/@PACKAGE@.spec
 	-@rm -f $(BUILD_RPMS) $(BUILD_SRPMS)