Update of /cvsroot/fink/fink
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv5077
Modified Files:
ChangeLog Makefile fink.info.in setup.sh
Log Message:
feed $Distribution to setup.sh
Index: fink.info.in
===================================================================
RCS file: /cvsroot/fink/fink/fink.info.in,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- fink.info.in 2 May 2009 17:37:17 -0000 1.39
+++ fink.info.in 2 Jul 2010 21:08:06 -0000 1.40
@@ -17,8 +17,8 @@
Source-MD5: @MD5@
NoSetPATH: true
CompileScript: <<
- make test PREFIX=%p ARCHITECTURE=%m
- ./setup.sh %p %m
+ make test PREFIX=%p ARCHITECTURE=%m distributi...@distribution@
+ ./setup.sh %p %m @DISTRIBUTION@
<<
InstallScript: <<
./install.sh %i %m
Index: Makefile
===================================================================
RCS file: /cvsroot/fink/fink/Makefile,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- Makefile 21 Mar 2009 14:52:55 -0000 1.34
+++ Makefile 2 Jul 2010 21:08:06 -0000 1.35
@@ -1,5 +1,6 @@
PREFIX=/sw
ARCHITECTURE=i386
+DISTRIBUTION=10.6
VERSION=`cat VERSION`
TEST_BASEPATH=$(PWD)/t/basepath
TESTS=.
@@ -11,6 +12,7 @@
@echo -e "\tbootstrap install a fresh fink installation"
@echo -e "\t PREFIX can be set, defaults to /sw"
@echo -e " ARCHITECTURE can also be set, defaults to i386"
+ @echo -e " DISTRIBUTION can also be set, defaults to 10.6"
@echo -e "\tinstall install to an existing fink installation"
@echo -e "\ttest perform tests on the fink code"
@echo -e "\tclean remove all extraneous files"
@@ -26,7 +28,7 @@
./inject.pl $(PREFIX)
test_setup:
- ./setup.sh $(TEST_BASEPATH) $(ARCHITECTURE)
+ ./setup.sh $(TEST_BASEPATH) $(ARCHITECTURE) $(DISTRIBUTION)
manifest_check:
perl -MExtUtils::Manifest=fullcheck -e 'my($$missing, $$extra) =
fullcheck;exit (@$$missing || @$$extra)'
Index: setup.sh
===================================================================
RCS file: /cvsroot/fink/fink/setup.sh,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- setup.sh 7 Jan 2010 01:50:23 -0000 1.39
+++ setup.sh 2 Jul 2010 21:08:06 -0000 1.40
@@ -21,14 +21,15 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA.
#
-if [ $# -ne 2 ]; then
+if [ $# -ne 3 ]; then
echo "Usage: ./setup.sh <prefix> <architecture>"
- echo " Example: ./setup.sh /sw i386"
+ echo " Example: ./setup.sh /sw i386 10.6"
exit 1
fi
basepath=$1
architecture=$2
+distribution=$3
version=`cat VERSION`
perlexe="/usr/bin/perl"
@@ -66,6 +67,7 @@
sed "s|@PREFIX@|$basepath|g" <fink.8.in \
| perl -MTime::Local -MPOSIX=strftime -p -e '$d="Date:";if (s/(\.Dd \$$d)
(\d+)\/(\d+)\/(\d+) (\d+):(\d+):(\d+) \$/\1/) {$epochtime =
timegm($7,$6,$5,$4,$3-1,$2-1900);$datestr = strftime "%B %e, %Y",
localtime($epochtime); s/(\.Dd )\$$d/$1$datestr/;}' \
>fink.8
+echo "Distribution $distribution..."
sed "s|@PREFIX@|$basepath|g" <fink.conf.5.in \
| perl -MTime::Local -MPOSIX=strftime -p -e '$d="Date:";if (s/(\.Dd \$$d)
(\d+)\/(\d+)\/(\d+) (\d+):(\d+):(\d+) \$/\1/) {$epochtime =
timegm($7,$6,$5,$4,$3-1,$2-1900);$datestr = strftime "%B %e, %Y",
localtime($epochtime); s/(\.Dd )\$$d/$1$datestr/;}' \
>fink.conf.5
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/ChangeLog,v
retrieving revision 1.527
retrieving revision 1.528
diff -u -d -r1.527 -r1.528
--- ChangeLog 25 Jun 2010 08:47:12 -0000 1.527
+++ ChangeLog 2 Jul 2010 21:08:05 -0000 1.528
@@ -1,3 +1,7 @@
+2010-07-02 Dave Morrison <d...@finkproject.org>
+
+ * fink.info.in, Makefile, setup.sh: feed $Distribution to setup.sh
+
2010-06-25 Daniel Macks <dma...@netspace.org>
* fink.8.in: Document 'fink list --format=' output modes
------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
