Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup.git;a=commitdiff;h=fd3fe6ab7f4ff1013330f885b528a3ca4a0449c6
commit fd3fe6ab7f4ff1013330f885b528a3ca4a0449c6 Author: Elentir <elen...@mailoo.org> Date: Sat Feb 27 00:03:29 2010 +0100 add gui to EXTRA_TARGETS and install diff --git a/Makefile b/Makefile index ab2c6c7..b9a41f5 100644 --- a/Makefile +++ b/Makefile @@ -74,12 +74,19 @@ UML ?= linux ifneq ($(DEBUG),false) export CFLAGS = -g endif +ifeq ($(GUI),true) +EXTRA_TARGETS += gui-iso +ifeq ($(USB),true) +EXTRA_TARGETS += gui-usb_img +endif +else ifeq ($(USB),true) EXTRA_TARGETS += usb_img endif ifeq ($(TFTP),true) EXTRA_TARGETS += tftp_img endif +endif CDIR = /var/cache/pacman-g2/pkg CONFDIR = config @@ -109,6 +116,12 @@ clean: check_root install: install -d -m0755 $(DESTDIR)$(PREFIX)/share/setup +ifeq ($(GUI),true) + install -m0644 fwife-$(FWIFE-MINIMALVER)-$(CARCH).iso $(DESTDIR)$(PREFIX)/share/setup/fwife-$(FWIFE-MINIMALVER)-$(CARCH).iso +ifeq ($(USB),true) + install -m0644 fwife-$(FWIFE-MINIMALVER)-$(CARCH)-usb.img $(DESTDIR)$(PREFIX)/share/setup/fwife-$(FWIFE-MINIMALVER)-$(CARCH)-usb.img +endif +else install -m0644 $(VMLINUZ)-$(KERNELV)-fw$(KERNELREL)-$(CARCH) $(DESTDIR)$(PREFIX)/share/setup/$(VMLINUZ)-$(KERNELV)-fw$(KERNELREL)-$(CARCH) install -m0644 initrd-$(CARCH).img.gz $(DESTDIR)$(PREFIX)/share/setup/initrd-$(CARCH).img.gz ifeq ($(USB),true) @@ -117,6 +130,7 @@ endif ifeq ($(TFTP),true) install -m0644 frugalware-$(FWVER)-$(CARCH)-tftp.img $(DESTDIR)$(PREFIX)/share/setup/frugalware-$(FWVER)-$(CARCH)-tftp.img endif +endif distclean: clean $(MAKE) -C po distclean _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
