r449 - x86/trunk/packages/docbook-xsl

justin at linuxfromscratch.org justin at linuxfromscratch.org
Mon Aug 1 02:06:08 PDT 2005


Author: justin
Date: 2005-08-01 03:06:05 -0600 (Mon, 01 Aug 2005)
New Revision: 449

Modified:
   x86/trunk/packages/docbook-xsl/Makefile
   x86/trunk/packages/docbook-xsl/install
Log:
Updated docbook-xsl Makefile and removed -v's from install.

Modified: x86/trunk/packages/docbook-xsl/Makefile
===================================================================
--- x86/trunk/packages/docbook-xsl/Makefile	2005-08-01 08:57:52 UTC (rev 448)
+++ x86/trunk/packages/docbook-xsl/Makefile	2005-08-01 09:06:05 UTC (rev 449)
@@ -1,30 +1,39 @@
 # DocBook XSL Stylesheets Makefile
+#==============================================================================
 
-# Package versions
 NM= docbook-xsl
 VRS= 1.68.1
 DIR= $(NM)-$(VRS)
+
 FILE= $(DIR).tar.bz2
-URL= http://easynews.dl.sourceforge.net/sourceforge/docbook/$(FILE)
+URL-$(FILE)= $(HTTPBLFS)/D-E/$(FILE)
+SHA-$(FILE)= b39a164cbfa6ec1373266bf1593610a366d72fa8
 
+# Targets
+# =============================================================================
 
+include $(ROOT)/scripts/functions
 
-#RULES
+chroot:
+	@chroot "$(MP)" $(chenv-blfs) \
+	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-.PHONY: clean chroot stage2
+stage2: Makefile $(FILE)
+	@$(std_build)
 
-chroot:
-	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+compile-stage2:
+	@$(call echo_message, Installing)
+#==============================================================================
+# Install commands below \/
+#==============================================================================
+	@../install
+	@ln -s xsl-stylesheets-$(VRS) /usr/share/xml/docbook/xsl-stylesheets-current
+#
+#==Status Messages===========================================
+#
+	@$(OK)
 
-stage2:
-	@echo ""
-	@echo "=====> Building $(NM) in chroot"
-	@echo ""
-	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
-	@if [ ! -d /usr/share/xml/docbook/xsl-stylesheets-current ] ; then unpack $(FILE) && cd $(DIR) && \
-	 ../install && \
-	 ln -s xsl-stylesheets-$(VRS) /usr/share/xml/docbook/xsl-stylesheets-current; fi
-	@make clean
-
 clean:
 	@-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2

Modified: x86/trunk/packages/docbook-xsl/install
===================================================================
--- x86/trunk/packages/docbook-xsl/install	2005-08-01 08:57:52 UTC (rev 448)
+++ x86/trunk/packages/docbook-xsl/install	2005-08-01 09:06:05 UTC (rev 449)
@@ -1,12 +1,12 @@
 #!/bin/bash
-install -v -d -m755 /usr/share/xml/docbook/xsl-stylesheets-1.68.1 &&
-install -v -d -m755 /etc/xml &&
+install -d -m755 /usr/share/xml/docbook/xsl-stylesheets-1.68.1 &&
+install -d -m755 /etc/xml &&
 chown -R root:root . &&
-cp -v -af INSTALL VERSION common eclipse extensions fo html htmlhelp \
+cp -af INSTALL VERSION common eclipse extensions fo html htmlhelp \
     images javahelp lib manpages params profiling template xhtml \
     /usr/share/xml/docbook/xsl-stylesheets-1.68.1 &&
-install -v -d -m755 /usr/share/doc/xml &&
-cp -v -af doc/* /usr/share/doc/xml &&
+install -d -m755 /usr/share/doc/xml &&
+cp -af doc/* /usr/share/doc/xml &&
 cd /usr/share/xml/docbook/xsl-stylesheets-1.68.1 &&
 sh INSTALL &&
 if [ ! -f /etc/xml/catalog ]; then




More information about the livecd mailing list