Author: aconway
Date: Fri Mar 9 08:51:47 2007
New Revision: 516459
URL: http://svn.apache.org/viewvc?view=rev&rev=516459
Log:
Merged revisions 492636 via svnmerge from
https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid
........
r492636 | aconway | 2007-01-04 11:55:03 -0500 (Thu, 04 Jan 2007) | 3 lines
Added "make check" to -build flag.
Removed rpm build directories from svn. Create them during make.
........
Modified:
incubator/qpid/branches/qpid.0-9/ (props changed)
incubator/qpid/branches/qpid.0-9/cpp/rpm/Makefile.am
Propchange: incubator/qpid/branches/qpid.0-9/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Mar 9 08:51:47 2007
@@ -1 +1 @@
-/incubator/qpid/trunk/qpid:1-492620
+/incubator/qpid/trunk/qpid:1-492620,492636
Modified: incubator/qpid/branches/qpid.0-9/cpp/rpm/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/rpm/Makefile.am?view=diff&rev=516459&r1=516458&r2=516459
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/rpm/Makefile.am (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/rpm/Makefile.am Fri Mar 9 08:51:47
2007
@@ -10,22 +10,17 @@
clean:
rm -rf BUILD RPMS SOURCES SPECS SRPMS
-.PHONY: rpm srpm dist dirs
+.PHONY: rpm srpm dist
# Build source and binary RPMs.
-rpm: dist dirs
+rpm: dist
rpmbuild $(RPMOPTS) -ba $(SPEC)
# Source RPM only.
-srpm: dist dirs
+srpm: dist
rpmbuild $(RPMOPTS) -bs $(SPEC)
-# Build source distribution.
+# Build source distribution and create required subdirs.
dist:
cd .. && $(MAKE) $(AM_MAKEFLAGS) dist
-
-# Create build directories.
-dirs: BUILD RPMS SOURCES SPECS SRPMS
-BUILD RPMS SOURCES SPECS SRPMS:
- $(MKDIR_P) BUILD RPMS SOURCES SPECS SRPMS
-
+ mkdir -p BUILD RPMS SOURCES SPECS SRPMS
