misc makefile install changes

diff --git a/Makefile b/Makefile
index b6dd4897b2bf29ce1048131b55677701fe94c001..cd369e74fc5927493218f7938e63603401252ec6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.5 2000/10/18 18:19:35 sljohnson Exp $
+# $Id: Makefile,v 1.6 2000/11/15 17:28:09 sljohnson Exp $
 #
 # Makefile for Spong (Version 2.6f and up).
 #
@@ -67,7 +67,8 @@ clientlib:
        cp -rp ./src/lib/Spong/Client $(SYSTEM)-client/lib/Spong/
        chmod 644 $(SYSTEM)-client/lib/Spong/*
        chmod 755 $(SYSTEM)-client/lib/Spong/Client
-       chown -R $(ADMUSER).$(ADMGROUP) ./$(SYSTEM)-client/lib
+       chown -R $(ADMUSER) ./$(SYSTEM)-client/lib
+       chgrp -R $(ADMGROUP) ./$(SYSTEM)-client/lib
 
 clientbin:     $(SYSTEM)-client/bin/spong-client
 
@@ -79,12 +80,14 @@ $(SYSTEM)-client/bin/%:     ./src/%.pl
        -e "s%@@WWWDIR@@%$(WWWDIR)%g" \
        $< > $@
        chmod +x ./$(SYSTEM)-client/bin/*
-       chown $(ADMUSER).$(ADMGROUP) ./$(SYSTEM)-client/bin/*
+       chown $(ADMUSER) ./$(SYSTEM)-client/bin/*
+       chgrp $(ADMGROUP) ./$(SYSTEM)-client/bin/*
 
 clientetc: ./config/spong.conf
        for f in $(CCONFIGS) ; do cp ./config/$$f $(SYSTEM)-client/etc; done
        cat ./config/spong.conf.$(SYSTEM) >> ./$(SYSTEM)-client/etc/spong.conf
-       chown -R $(ADMUSER).$(ADMGROUP) ./$(SYSTEM)-client/etc
+       chown -R $(ADMUSER) ./$(SYSTEM)-client/etc
+       chgrp -R $(ADMGROUP) ./$(SYSTEM)-client/etc
 
 client-install:
 
@@ -114,7 +117,8 @@ $(BINDIR)/%:        ./src/%.pl
        -e "s%@@WWWDIR@@%$(WWWDIR)%g" \
        $< > $@
        chmod -R 755 $(BINDIR)
-       chown -R $(ADMUSER).$(ADMGROUP) $(BINDIR)
+       chown -R $(ADMUSER) $(BINDIR)
+       chgrp -R $(ADMGROUP) $(BINDIR)
 
 # --- configs ---
 
@@ -124,7 +128,8 @@ $(ETCDIR):
        mkdir -p $@
        chmod 751 $(ETCDIR)
 etcown:
-       chown -R $(ADMUSER).$(ADMGROUP) $(ETCDIR)
+       chown -R $(ADMUSER) $(ETCDIR)
+       chgrp -R $(ADMGROUP) $(ETCDIR)
 
 configs:       $(CONFIGS)
 
@@ -157,7 +162,8 @@ library:    $(LIBDIR)/Spong
 $(LIBDIR)/Spong:       ./src/lib/Spong
        cp -rp ./src/lib/Spong $(LIBDIR)/Spong/
        chmod -R ugo+rwX,go-w $(LIBDIR)/Spong/
-       chown -R $(ADMUSER).$(ADMGROUP) $(LIBDIR)
+       chown -R $(ADMUSER) $(LIBDIR)
+       chgrp -R $(ADMGROUP) $(LIBDIR)
 
 # --- webpages ---
 
@@ -166,7 +172,8 @@ webdir:             $(WWWDIR) webpages
 $(WWWDIR):
        mkdir -p $@
        mkdir $@/html
-       chown $(WEBUSER).$(WEBGROUP) $@ $@/html
+       chown $(WEBUSER) $@ $@/html
+       chgrp $(WEBGROUP) $@ $@/html
 
 webpages:      $(WEBDIRS) $(WEBPAGES)
 
@@ -175,15 +182,20 @@ webpages: $(WEBDIRS) $(WEBPAGES)
 $(WWWDIR)/docs:        ./www/docs
        cp -rp $< $@
        chmod -R ugo+rwX,go-w $@
-       chown -R $(WEBUSER).$(WEBGROUP) $@
+       chown -R $(WEBUSER) $@
+       chgrp -R $(WEBGROUP) $@
+
 $(WWWDIR)/gifs:        ./www/gifs
        cp -rp $< $@
        chmod -R ugo+rwX,go-w $@
-       chown -R $(WEBUSER).$(WEBGROUP) $@
+       chown -R $(WEBUSER) $@
+       chgrp -R $(WEBGROUP) $@
+
 $(WWWDIR)/html/%:      ./www/html/%
        sed -e "s%__DIR__%$(DOCROOT)%g" $< > $@
        chmod ugo+rwX,go-w $@
-       chown $(WEBUSER).$(WEBGROUP) $@
+       chown $(WEBUSER) $@
+       chgrp $(WEBGROUP) $@
 
 # --- cgiscripts ---
 
@@ -192,7 +204,8 @@ cgidir:             $(CGIDIR) cgiscripts cgiown
 $(CGIDIR):
        mkdir -p $@
 cgiown:
-       chown -R $(ADMUSER).$(ADMGROUP) $(CGIDIR)
+       chown -R $(ADMUSER) $(CGIDIR)
+       chgrp -R $(ADMGROUP) $(CGIDIR)
 
 cgiscripts:    $(CGISCRIPTS)
 
@@ -202,8 +215,11 @@ $(CGIDIR)/%:       ./src/%.pl
        -e "s%@@LIBDIR@@%$(LIBDIR)%g" \
        -e "s%@@ETCDIR@@%$(ETCDIR)%g" \
        -e "s%@@WWWDIR@@%$(WWWDIR)%g" \
+       -e "s%@@VER@@%$(SPONGVER)%g" \
        $< > $@
-       chown $(WEBUSER).$(WEBGROUP) $(CGIDIR)/*
+       chmod 0755 $@
+       chown $(WEBUSER) $@
+       chgrp $(WEBGROUP) $@
 
 # --- misc install directories ---
 
@@ -212,21 +228,25 @@ tmpdir:   $(TMPDIR)
 $(TMPDIR):
        [ -d $@ ] || mkdir -p $@
        chmod ugo+rwX,go-w $@
-       chown $(ADMUSER).$(ADMGROUP) $@
+       chown $(ADMUSER) $@
+       chgrp $(ADMGROUP) $@
 
 vardir:        $(VARDIR) $(VARDIR)/archives $(DBDIR)
 
 $(VARDIR):
        [ -d $@ ] || mkdir -p $@
        chmod ugo+rwX,go-w $@
-       chown $(ADMUSER).$(ADMGROUP) $@
+       chown $(ADMUSER) $@
+       chgrp $(ADMGROUP) $@
 
 $(DBDIR):
        [ -d $@ ] || mkdir -p $@
        chmod ugo+rwX,go-w $@
-       chown $(ADMUSER).$(ADMGROUP) $@
+       chown $(ADMUSER) $@
+       chgrp $(ADMGROUP) $@
 
 $(VARDIR)/archives:
        [ -d $@ ] || mkdir -p $@
        chmod ugo+rwX,go-w $@
-       chown $(ADMUSER).$(ADMGROUP) $@
+       chown $(ADMUSER) $@
+       chgrp $(ADMGROUP) $@

diff --git a/config.mk b/config.mk
index 49301941e3bcf8e98184e8d5a9e4976ccaf7c4bf..287c3ea80c16596845ded0bfba7529110fa9b690 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -1,10 +1,10 @@
-# $Id: config.mk,v 1.3 2000/10/17 19:17:56 sljohnson Exp $
+# $Id: config.mk,v 1.4 2000/11/15 17:28:09 sljohnson Exp $
 #
 # Test include for ./Makefile
 # Rename this "config.mk" for testing.
 #
 #---- Default OS
-SYSTEM=solaris
+SYSTEM=osf1
 
 #---- Modifiable Variables from Build Script ------------------
 

diff --git a/spong.mk b/spong.mk
index 1e493c0b5716a77e254b971a75cbf27f219614f1..1d6557a8af2ac97ab977e7938cd05d82320f086b 100644 (file)
--- a/spong.mk
+++ b/spong.mk
@@ -1,5 +1,10 @@
-# $Id: spong.mk,v 1.4 2000/10/18 18:19:35 sljohnson Exp $
+# $Id: spong.mk,v 1.5 2000/11/15 17:28:09 sljohnson Exp $
 #
+#
+# Spong version
+
+SPONGVER=2.7.0
+
 #---- Operating system list [ should match ./config/spong.conf.$OS ]
 
 OS=aix bsdi freebsd hpux irix linux osf1 solaris
@@ -15,7 +20,7 @@ BINLIST= \
 
 LIBLIST= \
        Ack AckList History HistoryList Host HostList Info Service \
-       ServiceList
+       ServiceList Log Logger
 
 CGILIST= www-spong www-spong-ack wap-spong
 
@@ -44,7 +49,7 @@ CONFIGS= \
 # For server, LIBRARY is lib/Spong/
 # For client, LIBRARY is lib/Spong/Client + CLIENT_LIBS in lib/Spong
 
-CLIENT_LIBS=Daemon.pm Status.pm
+CLIENT_LIBS=Daemon.pm Status.pm Log.pm Logger.pm
 
 WEBDIRS = \
        $(WWWDIR)/docs \