OSSP CVS Repository

ossp - Check-in [294]
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [Patchset]  [Tagging/Branching

Check-in Number: 294
Date: 2001-Jan-18 13:54:56 (local)
2001-Jan-18 12:54:56 (UTC)
User:rse
Branch:
Comment: Switch to GNU shtool
Tickets:
Inspections:
Files:
ossp-pkg/petidomo/Makefile.in      1.25 -> 1.26     19 inserted, 20 deleted
ossp-pkg/petidomo/configure.in      1.7 -> 1.8     2 inserted, 3 deleted

ossp-pkg/petidomo/Makefile.in 1.25 -> 1.26

--- Makefile.in  2001/01/18 12:28:24     1.25
+++ Makefile.in  2001/01/18 12:54:56     1.26
@@ -15,7 +15,7 @@
 RANLIB          = @RANLIB@
 LEX             = @LEX@
 YACC            = @YACC@
-INSTALL         = ../etc/install-sh -c
+SHTOOL          = ./shtool
 
 CFLAGS          = @CFLAGS@
 CPPFLAGS        = @CPPFLAGS@ @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)\" -DLIBEXECDIR=\"$(libexecdir)\" \
@@ -59,28 +59,27 @@
         (cd `echo $@ | sed -e 's@/.*@@'` && $(MAKE) $(FLAGS_TO_PASS))
 
 install:        petidomo
-        @if [ ! -d $(bindir) ]; then $(INSTALL) -d $(bindir); fi
-        @if [ ! -d $(sysconfdir) ]; then $(INSTALL) -d $(sysconfdir); fi
-        @if [ ! -d $(localstatedir)/lists ]; then $(INSTALL) -d $(localstatedir)/lists; fi
-        @if [ ! -d $(localstatedir)/ack_queue ]; then $(INSTALL) -d $(localstatedir)/ack_queue; fi
-        @if [ ! -d $(datadir) ]; then $(INSTALL) -d $(datadir); fi
-        @if [ ! -d $(libexecdir) ]; then $(INSTALL) -d $(libexecdir); fi
-        $(INSTALL) -s -m 555 petidomo $(bindir)
-        $(INSTALL) -m 644 ../etc/petidomo.conf $(sysconfdir)/petidomo.conf-sample
-        $(INSTALL) -m 644 ../etc/petidomo.acl $(sysconfdir)/petidomo.acl-sample
-        $(INSTALL) -m 444 ../etc/help $(datadir)/help
-        $(INSTALL) -m 555 ../etc/InsertNameInSubject.sh $(libexecdir)
-        $(INSTALL) -m 555 ../etc/pgp-decrypt.sh $(libexecdir)
-        $(INSTALL) -m 555 ../etc/pgp-encrypt.sh $(libexecdir)
-        $(INSTALL) -m 555 ../etc/rfc2369.sh $(libexecdir)
+        $(SHTOOL) mkdir -f -p -m 755 $(bindir)
+        $(SHTOOL) mkdir -f -p -m 755 $(sysconfdir)
+        $(SHTOOL) mkdir -f -p -m 755 $(localstatedir)/lists
+        $(SHTOOL) mkdir -f -p -m 755 $(localstatedir)/ack_queue
+        $(SHTOOL) mkdir -f -p -m 755 $(datadir)
+        $(SHTOOL) mkdir -f -p -m 755 $(libexecdir)
+        $(SHTOOL) install -c -s -m 555 petidomo $(bindir)
+        $(SHTOOL) install -c -m 644 ../etc/petidomo.conf $(sysconfdir)/petidomo.conf-sample
+        $(SHTOOL) install -c -m 644 ../etc/petidomo.acl $(sysconfdir)/petidomo.acl-sample
+        $(SHTOOL) install -c -m 444 ../etc/help $(datadir)/help
+        $(SHTOOL) install -c -m 555 ../etc/InsertNameInSubject.sh $(libexecdir)
+        $(SHTOOL) install -c -m 555 ../etc/pgp-decrypt.sh $(libexecdir)
+        $(SHTOOL) install -c -m 555 ../etc/pgp-encrypt.sh $(libexecdir)
+        $(SHTOOL) install -c -m 555 ../etc/rfc2369.sh $(libexecdir)
 
 install-testlist:
-        @if [ ! -d $(localstatedir)/lists/testlist ]; then $(INSTALL) -d $(localstatedir)/lists/testlist; fi
-        $(INSTALL) -m 644 ../etc/list-config $(localstatedir)/lists/testlist/config
-        $(INSTALL) -m 644 ../etc/list-acl $(localstatedir)/lists/testlist/acl
+        $(SHTOOL) mkdir -f -p -m 755 $(localstatedir)/lists/testlist
+        $(SHTOOL) install -c -m 644 ../etc/list-config $(localstatedir)/lists/testlist/config
+        $(SHTOOL) install -c -m 644 ../etc/list-acl $(localstatedir)/lists/testlist/acl
         @rm -f $(localstatedir)/lists/testlist/list
-        cp /dev/null $(localstatedir)/lists/testlist/list
-        @chmod 644 $(localstatedir)/lists/testlist/list
+        $(SHTOOL) install -c -m 644 /dev/null $(localstatedir)/lists/testlist/list
 
 clean distclean realclean::
         @for n in lib*; do (cd $$n && $(MAKE) $@); done


ossp-pkg/petidomo/configure.in 1.7 -> 1.8

--- configure.in 2001/01/11 14:11:33     1.7
+++ configure.in 2001/01/18 12:54:57     1.8
@@ -1,12 +1,11 @@
 dnl
 dnl configure.in -- Process this file with autoconf to produce a configure script.
 dnl
-dnl $Header: /v/ossp/cvs/ossp-pkg/petidomo/configure.in,v 1.7 2001/01/11 14:11:33 simons Exp $
+dnl $Header: /v/ossp/cvs/ossp-pkg/petidomo/configure.in,v 1.8 2001/01/18 12:54:57 rse Exp $
 dnl
 
 AC_INIT(petidomo.h)
-AC_CONFIG_AUX_DIR(../etc)
-AC_REVISION($Revision: 1.7 $)dnl
+AC_REVISION($Revision: 1.8 $)dnl
 
 dnl Checks for paths and programs.
 dnl

CVSTrac 2.0.1