r472 - x86/trunk/packages/xfce

justin at linuxfromscratch.org justin at linuxfromscratch.org
Mon Aug 1 16:17:44 PDT 2005


Author: justin
Date: 2005-08-01 17:17:43 -0600 (Mon, 01 Aug 2005)
New Revision: 472

Modified:
   x86/trunk/packages/xfce/Makefile
Log:
Updated xfce Makefile.

Modified: x86/trunk/packages/xfce/Makefile
===================================================================
--- x86/trunk/packages/xfce/Makefile	2005-08-01 22:45:25 UTC (rev 471)
+++ x86/trunk/packages/xfce/Makefile	2005-08-01 23:17:43 UTC (rev 472)
@@ -1,36 +1,65 @@
 # xfce Makefile
+#==============================================================================
 
-# Package versions
 NM= xfce
 VRS= 4.2.2
 DIR= $(NM)-$(VRS)
+
 FILE= $(DIR)-src.tar.bz2
-URL= http://www.us.xfce.org/archive/xfce-4.2.2/fat_tarballs/$(FILE)
+URL-$(FILE)= $(HTTPBLFS)/W-Z/$(FILE)
+SHA-$(FILE)= e589ded559cf86fbb92b85711081df0aca00249d
 
-#RULES
+# Targets
+# =============================================================================
 
-.PHONY: clean chroot stage2
+include $(ROOT)/scripts/functions
 
 chroot:
-	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+	@chroot "$(MP)" $(chenv-blfs) \
+	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2:
-	@echo ""
-	@echo "=====> Building $(NM) in chroot"
-	@echo ""
-	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
-	@if [ ! -f /usr/bin/startxfce4 ] ; then unpack $(FILE) && cd $(DIR)/src && \
-	 for i in `cat ../../list` ; do unpack $$i.tar.gz && cd $$i && \
-	 ./configure --prefix=/usr --sysconfdir=/etc --enable-debug=no --enable-panel --enable-startup-notification --libexecdir=/usr/sbin && \
-	 make -j3 && make install && cd .. ; done ; fi
+stage2: Makefile $(FILE)
+	@$(std_build)
+
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@./configure --prefix=/usr --sysconfdir=/etc --enable-debug=no \
+	 --enable-panel --enable-startup-notification --libexecdir=/usr/sbin \
+	 >../$(DIR)-$@.log 2>&1
+#
+#==Status Messages==========================================
+#
+	@$(OK)
+	@$(call echo_message, Making)
+#==============================================================================
+# Make commands below \/
+#==============================================================================
+	@make $(PM) >>../$(DIR)-$@.log 2>&1
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+	@$(call echo_message, Installing)
+#==============================================================================
+# Install commands below \/
+#==============================================================================
+	@make install >>../$(DIR)-$@.log 2>&1
 	@cp $(ROOT)/root/.xinitrc /root/
 	@cp desktop-files/* /usr/share/applications
-	-sed -i -e 's/mozilla/firefox/' /etc/xdg/xfce4/desktop/menu.xml*
-	-sed -i -e 's/Mozilla/Firefox/' /etc/xdg/xfce4/desktop/menu.xml*
-	-rm -f `grep -L 'include type="system"' /etc/xdg/xfce4/desktop/menu.xml*`
-	-for f in /etc/xdg/xfce4/panel/contents.xml* ; do ./cleanup-panel.pl $$f ; done
-	-sed -i -e '/Xft.dpi/d' /etc/xdg/xfce4/xinitrc
-	@make clean
+	@sed -i -e 's/mozilla/firefox/' /etc/xdg/xfce4/desktop/menu.xml*
+	@sed -i -e 's/Mozilla/Firefox/' /etc/xdg/xfce4/desktop/menu.xml*
+	@rm -f `grep -L 'include type="system"' /etc/xdg/xfce4/desktop/menu.xml*`
+	@for f in /etc/xdg/xfce4/panel/contents.xml* ; do ./cleanup-panel.pl $$f ; done
+	@sed -i -e '/Xft.dpi/d' /etc/xdg/xfce4/xinitrc
+#
+#==Status Messages===========================================
+#
+	@$(OK)
 
 clean:
 	@-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2




More information about the livecd mailing list