Update of /cvsroot/monetdb/pathfinder
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14338
Modified Files:
Tag: XQuery_0-18
MonetDB-XQuery.spec.in rpm.mk.in
Log Message:
Created srpm Makefile target.
Index: MonetDB-XQuery.spec.in
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/MonetDB-XQuery.spec.in,v
retrieving revision 1.21.2.3
retrieving revision 1.21.2.4
diff -u -d -r1.21.2.3 -r1.21.2.4
--- MonetDB-XQuery.spec.in 24 Jul 2007 17:35:35 -0000 1.21.2.3
+++ MonetDB-XQuery.spec.in 25 Jul 2007 13:36:07 -0000 1.21.2.4
@@ -22,8 +22,6 @@
%endif
BuildRequires: libxml2-devel
-%define comp_cc @CC@
-
# groups of related archs
%define all_x86 i386 i586 i686
@@ -60,7 +58,7 @@
--enable-assert=no \
--enable-optimize \
--enable-bits=%{bits} \
- CC="%{comp_cc}" \
+ %{?comp_cc:CC="%{comp_cc}"} \
--prefix=%{prefix} \
--libdir=%{_libdir} \
--with-monet=%{prefix}
Index: rpm.mk.in
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/rpm.mk.in,v
retrieving revision 1.9.4.1
retrieving revision 1.9.4.2
diff -u -d -r1.9.4.1 -r1.9.4.2
--- rpm.mk.in 22 Jun 2007 13:25:35 -0000 1.9.4.1
+++ rpm.mk.in 25 Jul 2007 13:36:07 -0000 1.9.4.2
@@ -27,8 +27,7 @@
$(top_builddir)/$(distdir).tar.gz:
$(MAKE) $(AM_MAKEFLAGS) dist
-rpm: MonetDB-XQuery.spec $(top_builddir)/$(distdir).tar.gz
-
+$(rpmtopdir)/rpmmacros:
mkdir -p $(rpmtopdir)/RPMS
mkdir -p $(rpmtopdir)/SRPMS
mkdir -p $(rpmtopdir)/SPECS
@@ -43,9 +42,16 @@
echo "%rpmcflags -O2 " >> $(rpmtopdir)/rpmmacros
echo "#%top_builddirroot %{_topdir}/INSTALL/" >> $(rpmtopdir)/rpmmacros
- $(RPMBUILD) --define="buildsystem 1" --target `uname -m` --rcfile
$(rpmtopdir)/rpmrc -ta $(top_builddir)/$(distdir).tar.gz
+rpm: MonetDB-XQuery.spec $(top_builddir)/$(distdir).tar.gz
$(rpmtopdir)/rpmmacros
+ $(RPMBUILD) --define="buildsystem 1" --define="comp_cc @CC@" --target
`uname -m` --rcfile $(rpmtopdir)/rpmrc -ta $(top_builddir)/$(distdir).tar.gz
for i in rpm/SRPMS/[EMAIL PROTECTED]@[EMAIL PROTECTED]@* ; do \
mv "$$i" "`echo "$$i" | sed 's|[EMAIL PROTECTED]@[EMAIL
PROTECTED]@||'`" ; \
done
rm -rf $(rpmtopdir)/BUILD
+
+srpm: MonetDB-XQuery.spec $(top_builddir)/$(distdir).tar.gz
$(rpmtopdir)/rpmmacros
+ $(RPMBUILD) --define="buildsystem 1" --rcfile $(rpmtopdir)/rpmrc -ts
$(top_builddir)/$(distdir).tar.gz
+ for i in rpm/SRPMS/[EMAIL PROTECTED]@[EMAIL PROTECTED]@* ; do \
+ mv "$$i" "`echo "$$i" | sed 's|[EMAIL PROTECTED]@[EMAIL
PROTECTED]@||'`" ; \
+ done
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
