r481 - x86/trunk/packages/sysklogd

justin at linuxfromscratch.org justin at linuxfromscratch.org
Mon Aug 1 20:46:08 PDT 2005


Author: justin
Date: 2005-08-01 21:46:06 -0600 (Mon, 01 Aug 2005)
New Revision: 481

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

Modified: x86/trunk/packages/sysklogd/Makefile
===================================================================
--- x86/trunk/packages/sysklogd/Makefile	2005-08-02 03:03:56 UTC (rev 480)
+++ x86/trunk/packages/sysklogd/Makefile	2005-08-02 03:46:06 UTC (rev 481)
@@ -1,35 +1,61 @@
 # Sysklogd Makefile
+#==============================================================================
 
-# Package versions
 NM= sysklogd
 VRS= 1.4.1
 DIR= $(NM)-$(VRS)
+
 FILE= $(DIR).tar.bz2
-PATCH=$(DIR)-fixes-1.patch
-URL= $(HTTP)/$(NM)/$(FILE)
-URL1= $(HTTP)/$(NM)/$(PATCH)
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= 2439b0ce3c3e0c98e5a03cee13a112cff9a801d2
 
-# RULES
+PATCH1=$(DIR)-fixes-1.patch
+URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
+SHA-$(PATCH1)= 4fbd5e56c212c8e37f363eb48ba86a5ecea21f4a
 
-.PHONY:  clean stage2 chroot
+# Targets
+# =============================================================================
 
+include $(ROOT)/scripts/functions
+
 chroot:
-	@chroot "$(MP)" $(chenv-post-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+	@chroot "$(MP)" $(chenv-post-bash) \
+	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2:
-	@echo ""
-	@echo "=====> Building $(NM) in chroot"
-	@echo ""
-	@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
-	 mv $(FILE) $(SRC) ; fi
-	@if [ ! -f $(SRC)/$(PATCH) ] ; then $(WGET) $(URL1) && \
-	 mv $(PATCH) $(SRC) ; fi
-	@if [ ! -f /etc/syslog.conf ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
-	 patch -Np1 -i $(SRC)/$(PATCH) && \
-	 make -j3 && make install && \
-	 cp -ra $(ROOT)/etc/syslog.conf /etc ; fi
-	@make clean
-	 
+stage2: Makefile $(FILE) $(PATCH1)
+	@$(std_build)
 
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@patch -Np1 -i $(SRC)/$(PATCH) >../$(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 -ra $(ROOT)/etc/syslog.conf /etc
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+
 clean:
 	@-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2




More information about the livecd mailing list