Update of /cvsroot/monetdb/sql
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14391
Modified Files:
Tag: SQL_2-18
MonetDB-SQL.spec.in rpm.mk.in
Log Message:
Created srpm Makefile target.
Index: MonetDB-SQL.spec.in
===================================================================
RCS file: /cvsroot/monetdb/sql/MonetDB-SQL.spec.in,v
retrieving revision 1.39.2.3
retrieving revision 1.39.2.4
diff -u -d -r1.39.2.3 -r1.39.2.4
--- MonetDB-SQL.spec.in 24 Jul 2007 17:35:46 -0000 1.39.2.3
+++ MonetDB-SQL.spec.in 25 Jul 2007 13:36:16 -0000 1.39.2.4
@@ -29,8 +29,6 @@
%endif
%endif
-%define comp_cc @CC@
-
# groups of related archs
%define all_x86 i386 i586 i686
@@ -96,7 +94,7 @@
--enable-assert=no \
--enable-optimize \
--enable-bits=%{bits} \
- CC="%{comp_cc}" \
+ %{?comp_cc:CC="%{comp_cc}"} \
--prefix=%{prefix} \
--libdir=%{_libdir} \
--with-monetdb=%{prefix} \
Index: rpm.mk.in
===================================================================
RCS file: /cvsroot/monetdb/sql/rpm.mk.in,v
retrieving revision 1.12.4.1
retrieving revision 1.12.4.2
diff -u -d -r1.12.4.1 -r1.12.4.2
--- rpm.mk.in 22 Jun 2007 13:26:19 -0000 1.12.4.1
+++ rpm.mk.in 25 Jul 2007 13:36:16 -0000 1.12.4.2
@@ -30,8 +30,7 @@
$(top_builddir)/$(distdir).tar.gz:
$(MAKE) $(AM_MAKEFLAGS) dist
-rpm: MonetDB-SQL.spec $(top_builddir)/$(distdir).tar.gz
-
+$(rpmtopdir)/rpmmacros
mkdir -p $(rpmtopdir)/RPMS
mkdir -p $(rpmtopdir)/SRPMS
mkdir -p $(rpmtopdir)/SPECS
@@ -46,9 +45,16 @@
echo "%rpmcflags -O2 " >> $(rpmtopdir)/rpmmacros
echo "#%top_builddirroot %{_topdir}/INSTALL/" >> $(rpmtopdir)/rpmmacros
- $(RPMBUILD) ${python} ${monetdb4} ${monetdb5} --define="buildsystem 1"
--target `uname -m` --rcfile $(rpmtopdir)/rpmrc -ta
$(top_builddir)/$(distdir).tar.gz
+rpm: MonetDB-SQL.spec $(top_builddir)/$(distdir).tar.gz
$(rpmtopdir)/rpmmacros
+ $(RPMBUILD) ${python} ${monetdb4} ${monetdb5} --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-SQL.spec $(top_builddir)/$(distdir).tar.gz
$(rpmtopdir)/rpmmacros
+ $(RPMBUILD) ${python} ${monetdb4} ${monetdb5} --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-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
