r448 - x86/trunk/packages/docbook-xml

justin at linuxfromscratch.org justin at linuxfromscratch.org
Mon Aug 1 01:57:54 PDT 2005


Author: justin
Date: 2005-08-01 02:57:52 -0600 (Mon, 01 Aug 2005)
New Revision: 448

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

Modified: x86/trunk/packages/docbook-xml/Makefile
===================================================================
--- x86/trunk/packages/docbook-xml/Makefile	2005-08-01 08:45:16 UTC (rev 447)
+++ x86/trunk/packages/docbook-xml/Makefile	2005-08-01 08:57:52 UTC (rev 448)
@@ -1,29 +1,38 @@
 # DocBook XML DTD Makefile
+#==============================================================================
 
-# Package versions
 NM= docbook-xml
 VRS= 4.4
 DIR= $(NM)-$(VRS)
+
 FILE= $(DIR).zip
-URL= http://www.docbook.org/xml/$(VRS)/$(FILE)
+URL-$(FILE)= $(HTTPBLFS)/D-E/$(FILE)
+SHA-$(FILE)= 7c4d91c82ad3747e1b5600c91782758e5d91c22b
 
+# 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
+#
+#==Status Messages===========================================
+#
+	@$(OK)
 
-stage2:
-	@echo ""
-	@echo "=====> Building $(NM) in chroot"
-	@echo ""
-	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
-	@if [ ! -f /etc/xml/docbook ] ; then mkdir $(DIR) && cd $(DIR) && unzip ../$(FILE) && \
-	 ../install ; fi
-	@make clean
-
 clean:
 	@-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2

Modified: x86/trunk/packages/docbook-xml/install
===================================================================
--- x86/trunk/packages/docbook-xml/install	2005-08-01 08:45:16 UTC (rev 447)
+++ x86/trunk/packages/docbook-xml/install	2005-08-01 08:57:52 UTC (rev 448)
@@ -1,8 +1,8 @@
 #!/bin/bash
-install -v -d -m755 /usr/share/xml/docbook/xml-dtd-4.4 &&
-install -v -d -m755 /etc/xml &&
+install -d -m755 /usr/share/xml/docbook/xml-dtd-4.4 &&
+install -d -m755 /etc/xml &&
 chown -R root:root . &&
-cp -v -af docbook.cat *.dtd ent/ *.mod /usr/share/xml/docbook/xml-dtd-4.4 &&
+cp -af docbook.cat *.dtd ent/ *.mod /usr/share/xml/docbook/xml-dtd-4.4 &&
 if [ ! -e /etc/xml/docbook ]; then
     xmlcatalog --noout --create /etc/xml/docbook
 fi &&




More information about the livecd mailing list