X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile;h=c8eafaf9c68bfd4ca31c0d03fb6b972431b6fef6;hb=09eaf293724cc1ed6100f5a8a97cecf8cc007956;hp=c3f227084080f4bb8a1af0aef1ac7b814f25e160;hpb=91349debdcb64fd626524c22a79b9750deb9f325;p=virt-p2v.git

diff --git a/Makefile b/Makefile
index c3f2270..c8eafaf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,29 @@
+# Makefile for virt-p2v
+#
+# Copyright (C) 2007 Red Hat Inc.
+# Written by Richard W.M. Jones <rjones@redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
 # $Id$
 
 #----------------------------------------------------------------------
 # General configuration
 
 PACKAGE  := virt-p2v
-VERSION  := 0.3
+VERSION  := 0.7
 
 # i386 images also work on x86-64, so best to stick with i386.
 ARCH     := i386
@@ -13,12 +32,12 @@ LANG	 := en_US.UTF-8
 KEYBOARD := us
 TIMEZONE := US/Eastern
 
-BASEREPO := http://download.fedora.redhat.com/pub/fedora/linux/releases/7/Fedora/$(ARCH)/os/
+BASEREPO := http://download.fedora.redhat.com/pub/fedora/linux/releases/8/Fedora/$(ARCH)/os/
 
 # Select a suitable HTTP proxy.
 # The default assumes a local squid proxy.
-export http_proxy := http://127.0.0.1:3128/
-export ftp_proxy := http://127.0.0.1:3128/
+#export http_proxy := http://127.0.0.1:3128/
+#export ftp_proxy := http://127.0.0.1:3128/
 
 LABEL	 := $(PACKAGE)-$(VERSION)
 
@@ -45,11 +64,9 @@ livecd.ks: livecd.ks.in livecd-post.sh Makefile
 	  -e 's|@TIMEZONE@|$(TIMEZONE)|g' \
 	  < $< | cat - livecd-post.sh > $@
 
-livecd-post.sh: livecd-post.sh.in p2v.init virt-p2v.sh inittab lvm.conf Makefile
+livecd-post.sh: livecd-post.sh.in virt-p2v.sh inittab lvm.conf Makefile
 	rm -f $@
 	sed \
-	  -e '/@P2V.INIT@/ r p2v.init' \
-	  -e '/@P2V.INIT@/ d' \
 	  -e '/@VIRT-P2V.SH@/ r virt-p2v.sh' \
 	  -e '/@VIRT-P2V.SH@/ d' \
 	  -e '/@INITTAB@/ r inittab' \
@@ -94,7 +111,6 @@ dist:
 	rm -rf $(PACKAGE)-$(VERSION)
 	mkdir $(PACKAGE)-$(VERSION)
 	tar -cf - -T MANIFEST | tar -C $(PACKAGE)-$(VERSION) -xf -
-	$(INSTALL) -m 0755 configure $(PACKAGE)-$(VERSION)/
 	tar zcf $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION)
 	rm -rf $(PACKAGE)-$(VERSION)
 	ls -l $(PACKAGE)-$(VERSION).tar.gz