[prev in list] [next in list] [prev in thread] [next in thread] 

List:       omd-commits
Subject:    [Omd-commits] OMD Git: omd: Cleaned up apache-omd package
From:       git () mathias-kettner ! de (git version control)
Date:       2010-08-21 19:10:11
Message-ID: 20100821191012.DAB85C10D43 () mail ! mathias-kettner ! de
[Download RAW message or body]

Module: omd
Branch: master
Commit: 85dc565803ba98aead56e229f7fee2b928b312b3
URL:    http://omdistro.org/projects/omd/repository/revisions/85dc565803ba98aead56e229f7fee2b928b312b3


Author: Lars Michelsen <lm at mathias-kettner.de>
Date:   Sat Aug 21 21:07:17 2010 +0200

Cleaned up apache-omd package

---

 packages/apache-omd/Makefile                       |   31 ++++++++++---------
 .../etc/apache/{apache.conf.in => apache.conf}     |    0 
 .../skel/etc/init.d/{apache.in => apache}          |    0 
 packages/apache-omd/skel/var/www/ham               |    1 -
 packages/apache-omd/skel/var/www/htdocs            |    1 -
 5 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/packages/apache-omd/Makefile b/packages/apache-omd/Makefile
index 8274473..dc1f3b9 100644
--- a/packages/apache-omd/Makefile
+++ b/packages/apache-omd/Makefile
@@ -1,27 +1,28 @@
 include ../../Makefile.omd
 
+NAME = apache-omd
+VERSION = 1.0
+DIR = $(NAME)-$(VERSION)
+
+.PHONY: skel
+
 build:
 	# Unpack source code, apply patches, call configure, call make
-	sed 's|###APACHE_MODULE_DIR###|$(APACHE_MODULE_DIR)|g' \
                skel/etc/apache/apache.conf.in > skel/etc/apache/apache.conf
-	sed 's|###APACHE_BIN###|$(APACHE_BIN)|g' skel/etc/init.d/apache.in > \
                skel/etc/init.d/apache
-	chmod +x skel/etc/init.d/apache
-	
-	#rm skel/etc/apache/apache.conf.in
-	#rm skel/etc/init.d/apache.in
-	mkdir -p skel/var/log/apache
-	mkdir -p skel/var/www
-	mkdir -p skel/tmp/apache/run
-	mkdir -p skel/tmp/php/session
 
 install:
 	# Install software below $(DESTDIR)$(OMD_ROOT)/{bin,lib,share}
 
 skel:
-	# Optional target called to create additional files below skel
-	# Create link to default webinterface redirect handler
-	ln -s ../../share/omd/htdocs skel/var/www/$(OMD_SITE)
+	# Replace macros
+	sed -i 's|###APACHE_MODULE_DIR###|$(APACHE_MODULE_DIR)|g' \
$(SKEL)/etc/apache/apache.conf +	sed -i 's|###APACHE_BIN###|$(APACHE_BIN)|g' \
$(SKEL)/etc/init.d/apache +	# Fix permissions
+	chmod +x $(SKEL)/etc/init.d/apache
+	# Create working directories
+	mkdir -p $(SKEL)/var/log/apache
+	mkdir -p $(SKEL)/var/www
+	mkdir -p $(SKEL)/tmp/apache/run
+	mkdir -p $(SKEL)/tmp/php/session
 
 clean:
 	# Remove files created by build/install
-	rm -f skel/etc/init.d/apache
-	rm -f skel/etc/apache/apache.conf
diff --git a/packages/apache-omd/skel/etc/apache/apache.conf.in \
b/packages/apache-omd/skel/etc/apache/apache.conf similarity index 100%
rename from packages/apache-omd/skel/etc/apache/apache.conf.in
rename to packages/apache-omd/skel/etc/apache/apache.conf
diff --git a/packages/apache-omd/skel/etc/init.d/apache.in \
b/packages/apache-omd/skel/etc/init.d/apache similarity index 100%
rename from packages/apache-omd/skel/etc/init.d/apache.in
rename to packages/apache-omd/skel/etc/init.d/apache
diff --git a/packages/apache-omd/skel/var/www/ham \
b/packages/apache-omd/skel/var/www/ham deleted file mode 120000
index 0e551ff..0000000
--- a/packages/apache-omd/skel/var/www/ham
+++ /dev/null
@@ -1 +0,0 @@
-../../share/omd/htdocs
\ No newline at end of file
diff --git a/packages/apache-omd/skel/var/www/htdocs \
b/packages/apache-omd/skel/var/www/htdocs deleted file mode 120000
index 0e551ff..0000000
--- a/packages/apache-omd/skel/var/www/htdocs
+++ /dev/null
@@ -1 +0,0 @@
-../../share/omd/htdocs
\ No newline at end of file


[prev in list] [next in list] [prev in thread] [next in thread]