Permalink
Browse files

Fix makefile generation for Debian

  • Loading branch information...
PavelVinogradov PavelVinogradov
PavelVinogradov authored and PavelVinogradov committed Jan 16, 2011
1 parent 50f0a52 commit 1aab6a1ef020f34f080662c2cd658f5dead496dc
Showing with 30 additions and 3 deletions.
  1. +14 −2 debian/README.Debian
  2. +8 −1 m4/httpd.m4
  3. +4 −0 plugins/fsusage/Makefile.am
  4. +4 −0 plugins/loadavg/Makefile.am
View
@@ -1,10 +1,14 @@
SAMS for Debian
---------------
SAMS split into two packages:
Packaging
---------
SAMS split into three packages:
sams - main package, contain all daemons and log parsers. Also include
database files.
sams-web - web interface for squid administration
sams-doc - sams documentation
This package not finished yet. It miss some issues:
- Write real manpages for all binary
@@ -16,7 +20,15 @@ This package not finished yet. It miss some issues:
All sql files placed in /usr/share/sams/mysql
If you find some bugs in this package - fell free to submite bug to
Apache integration
------------------
Sams always use $HTTP_ROOT/conf.d directory as place for sams2.conf file
Feedback
--------
If you find bugs in this package - fell free to submit it to
http://sams.nixdev.net/ on debpackage component.
-- Pavel Vinogradov <Pavel.Vinogradov@nixdev.net> Fri, 3 Aug 2007 10:57:04 +0500
View
@@ -14,6 +14,8 @@ HTTPD_ROOT=`$HTTPD_SERVER -V |grep HTTPD_ROOT|sed -e 's/"//g'|sed -e 's/=/ /g'|s
SERVER_CONFIG_FILE=$HTTPD_ROOT/`$HTTPD_SERVER -V |grep SERVER_CONFIG_FILE|sed -e 's/"//g'|sed -e 's/=/ /g'|sed -e 's/-D SERVER_CONFIG_FILE//g'|sed -e 's/\n//g'|sed -e 's/ //g'`
altlinux5=`grep -qi "ALT Linux 5" /etc/altlinux-release &>/dev/null && echo 1 || echo 0`
altlinux4=`grep -qi "ALT Linux 4" /etc/altlinux-release &>/dev/null && echo 1 || echo 0`
debian=`test -e /etc/debian_version && echo 1 || echo 0`
if [[ $altlinux5 -eq 1 ]]
then
HTTPD_INCLUDE=$HTTPD_ROOT/`grep ^"Include " $SERVER_CONFIG_FILE | grep "sites-enabled" |sed -e 's|/.*$ |/|g'|sed -e 's/Include//g'|sed -e 's, ,,g'| sed -e 's/[[^\/]]*$//g'`
@@ -22,7 +24,12 @@ else
then
HTTPD_INCLUDE=$HTTPD_ROOT/`grep ^"Include " $SERVER_CONFIG_FILE | grep "sites-enabled" |sed -e 's|/.*$ |/|g'|sed -e 's/Include//g'|sed -e 's, ,,g'| sed -e 's/[[^\/]]*$//g'`
else
HTTPD_INCLUDE=$HTTPD_ROOT/`grep ^"Include " $SERVER_CONFIG_FILE |sed -e 's|/.*$ |/|g'|sed -e 's/Include//g'|sed -e 's, ,,g'| sed -e 's/[[^\/]]*$//g'`
if [[ $debian -eq 1 ]]
then
HTTPD_INCLUDE=$HTTPD_ROOT/conf.d/
else
HTTPD_INCLUDE=$HTTPD_ROOT/`grep ^"Include " $SERVER_CONFIG_FILE |sed -e 's|/.*$ |/|g'|sed -e 's/Include//g'|sed -e 's, ,,g'| sed -e 's/[[^\/]]*$//g'`
fi
fi
fi
@@ -11,3 +11,7 @@ DISTCLEANFILES = Makefile.in
INCLUDES = $(all_includes)
AM_CXXFLAGS = -Wall
distclean:
rm -f Makefile
rm -f $(DISTCLEANFILES)
@@ -11,3 +11,7 @@ DISTCLEANFILES = Makefile.in
INCLUDES = $(all_includes)
AM_CXXFLAGS = -Wall
distclean:
rm -f Makefile
rm -f $(DISTCLEANFILES)

0 comments on commit 1aab6a1

Please sign in to comment.