From 48d7579b5ec4c35deeee5d22464dac4983731475 Mon Sep 17 00:00:00 2001 From: Manoj Srivastava Date: Mon, 1 Dec 2003 17:26:06 +0000 Subject: Incorporate previous changes to dist These changes were done while the archive was under CVS cxontrol. They include changing the location of perl from /usr/local/bin to /usr/bin (the former would not work for debian systems). Changing the section of a few man pages to section 7. changing do sub() to &sub(); and various places adding a default case for make rules. git-archimport-id: srivasta@debian.org--2003-primary/dist--debian--3.70--patch-1 --- bin/packinit.SH | 1 + bin/packinit.man | 2 +- bin/perload | 2 +- dist.man | 2 +- jmake/bindex.SH | 2 +- jmake/files/Jmake.rules | 34 +++++++++++++++++----------------- mcon/U/Chk_MANI.U | 2 +- mcon/U/nis.U | 12 ++++++++++++ mcon/makegloss.SH | 6 +++--- 9 files changed, 38 insertions(+), 25 deletions(-) diff --git a/bin/packinit.SH b/bin/packinit.SH index 55dee75..7d024f8 100644 --- a/bin/packinit.SH +++ b/bin/packinit.SH @@ -16,6 +16,7 @@ case "$0" in esac echo "Extracting bin/packinit (with variable substitutions)" cat >packinit < (version 2.0) .br Raphael Manfredi .SH "SEE ALSO" -dist(1). +dist(7). diff --git a/bin/perload b/bin/perload index 6b426fa..a859c22 100755 --- a/bin/perload +++ b/bin/perload @@ -1,4 +1,4 @@ -: # feed this into perl +#! /usr/bin/perl '/bin/true' && eval 'exec perl -S $0 "$@"' if $running_under_some_shell; 'di'; diff --git a/dist.man b/dist.man index b1aed8f..902d26f 100644 --- a/dist.man +++ b/dist.man @@ -42,7 +42,7 @@ .in -5 .fi .. -.TH DIST 1 ram +.TH DIST 7 ram .SH NAME dist \- introduction to dist .SH DESCRIPTION diff --git a/jmake/bindex.SH b/jmake/bindex.SH index b665600..f419d78 100755 --- a/jmake/bindex.SH +++ b/jmake/bindex.SH @@ -148,7 +148,7 @@ foreach $rule (sort(keys %Seen)) { $line = $Wants{$rule}; if (length($line)) { $line = "->$line."; - $line = do format($line); + $line = &format($line); print INDEX "$line\n"; } $line = $Init{$rule}; diff --git a/jmake/files/Jmake.rules b/jmake/files/Jmake.rules index 410fbc8..2144911 100644 --- a/jmake/files/Jmake.rules +++ b/jmake/files/Jmake.rules @@ -260,7 +260,7 @@ AllTarget(manpages) @!\ @!\ install.man:: @@\ @if test "$(MANSRC)"; then \ @@\ - case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\ + case '${MFLAGS}' in *[i]*) set +e;; *) set -e;; esac; \ @@\ for file in manpages; do \ @@\ (set -x; $(INSTALL) -c -m 444 $$file $(MANSRC)); \ @@\ done; \ @@\ @@ -268,7 +268,7 @@ install.man:: @@\ @!\ deinstall.man:: @@\ @if test "$(MANSRC)"; then \ @@\ - case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\ + case '${MFLAGS}' in *[i]*) set +e;; *) set -e;; esac; \ @@\ for file in manpages; do \ @@\ (set -x; $(RM) $(MANSRC)/$$file); \ @@\ done; \ @@\ @@ -461,13 +461,13 @@ InstallScriptWithFlags(script,dest,^^) |once _InstallScripts_ @!\ install:: $(SCRIPTS) $(LSCRIPTS) @@\ @for file in $(SCRIPTS) $(LSCRIPTS); do \ @@\ - case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\ + case '${MFLAGS}' in *[i]*) set +e;; *) set -e;; esac; \ @@\ (set -x; $(INSTALL) -c -m 555 $$file $(SCRIPTDIR)); \ @@\ done @!\ @!\ deinstall:: @@\ @for file in $(SCRIPTS) $(LSCRIPTS); do \ @@\ - case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\ + case '${MFLAGS}' in *[i]*) set +e;; *) set -e;; esac; \ @@\ (set -x; $(RM) $(SCRIPTDIR)/$$file); \ @@\ done @!\ -once @@ -486,7 +486,7 @@ deinstall:: @@\ ?NOMAN:|skip @!\ install.man:: @@\ @if test "$(MANSRC)"; then \ @@\ - case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\ + case '${MFLAGS}' in *[i]*) set +e;; *) set -e;; esac; \ @@\ for file in $(SCRIPTS); do \ @@\ if test -f $$file.man; then \ @@\ (set -x; \ @@\ @@ -497,7 +497,7 @@ install.man:: @@\ @!\ deinstall.man:: @@\ @if test "$(MANSRC)"; then \ @@\ - case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\ + case '${MFLAGS}' in *[i]*) set +e;; *) set -e;; esac; \ @@\ for file in $(SCRIPTS); do \ @@\ (set -x; $(RM) $(MANSRC)/$$file.$(L)); \ @@\ done; \ @@\ @@ -515,7 +515,7 @@ deinstall.man:: @@\ #define LinkFileList(step,list,dir,sub) @!\ >LN @!\ step:: list @@\ - @case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\ + @case '${MFLAGS}' in *[i]*) set +e;; *) set -e;; esac; \ @@\ echo " cd" dir; cd dir; for i in list; do (set -x; $(LN) sub/$$i .); done @@ -529,13 +529,13 @@ step:: list @@\ >INSTALL @!\ >RM @!\ step:: list @@\ - @case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\ + @case '${MFLAGS}' in *[i]*) set +e;; *) set -e;; esac; \ @@\ for i in list; do \ @@\ (set -x; $(INSTALL) -c flags $$i dest); \ @@\ done @!\ @!\ de^^step:: @@\ - @case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\ + @case '${MFLAGS}' in *[i]*) set +e;; *) set -e;; esac; \ @@\ for i in list; do \ @@\ (set -x; $(RM) dest/$$i); \ @@\ done @@ -1237,11 +1237,11 @@ local_realclean:: @@\ #define CommonSubdirsRule(dirs) @!\ >MAKE @!\ subdirs: @@\ - @case '${MFLAGS}' in *[ik]*) set +e;; esac; \ @@\ + @case '${MFLAGS}' in *[ik]*) set +e;; *) set -e;; esac; \ @@\ for i in dirs ;\ @@\ do \ @@\ (cd $$i ; echo $(VERB) "in $(DIR)$$i..."; \ @@\ - $(MAKE) $(MFLAGS) $(FLAGS) $(TARGET)); \ @@\ + $(MAKE) $(MFLAGS) $(FLAGS) $(TARGET)) || false; \ @@\ done @@ -1252,11 +1252,11 @@ subdirs: @@\ #define NamedTargetSubdirsRule(dirs,name,verb,flags) @!\ >MAKE @!\ name:: @@\ - @case '${MFLAGS}' in *[ik]*) set +e;; esac; \ @@\ + @case '${MFLAGS}' in *[ik]*) set +e;; *) set -e;; esac; \ @@\ for i in dirs ;\ @@\ do \ @@\ (cd $$i ; echo verb "in $(DIR)$$i..."; \ @@\ - $(MAKE) $(MFLAGS) flags name); \ @@\ + $(MAKE) $(MFLAGS) flags name) || false; \ @@\ done @@ -1389,7 +1389,7 @@ LintDirs($(SUBDIRS)) #define MakeDirs(dirs) \ >INSTALLDIR @@\ @for dir in dirs; do \ @@\ - case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\ + case '${MFLAGS}' in *[i]*) set +e;; *) set -e;; esac; \ @@\ (set -x; test -d $$dir || $(INSTALLDIR) $$dir); \ @@\ done @@ -1434,13 +1434,13 @@ MakeLintSubdirs(dirs,lintlib) #define MakeMakeSubdirs(target) @!\ >MAKE @!\ target:: @@\ - @case '${MFLAGS}' in *[ik]*) set +e;; esac; \ @@\ + @case '${MFLAGS}' in *[ik]*) set +e;; *) set -e;; esac; \ @@\ for i in $(SUBDIRS);\ @@\ do \ @@\ echo "Making "target" in $(DIR)$$i..."; \ @@\ (cd $$i || exit 1; \ @@\ if test ! -f Makefile; then /bin/sh Makefile.SH; fi; \ @@\ - $(MAKE) $(MFLAGS) target) \ @@\ + $(MAKE) $(MFLAGS) target) || false\ @@\ done @@ -1454,7 +1454,7 @@ target:: @@\ #define MakeMakefilesSH() @!\ >MAKE @!\ Makefiles.SH:: Makefile.SH @@\ - @case '${MFLAGS}' in *[ik]*) set +e;; esac; \ @@\ + @case '${MFLAGS}' in *[ik]*) set +e;; *) set -e;; esac; \ @@\ for i in $(SUBDIRS);\ @@\ do \ @@\ case "$(DIR)$$i/" in \ @@\ diff --git a/mcon/U/Chk_MANI.U b/mcon/U/Chk_MANI.U index 52fc44c..6f0ecd8 100644 --- a/mcon/U/Chk_MANI.U +++ b/mcon/U/Chk_MANI.U @@ -39,7 +39,7 @@ if test -f $rsrc/MANIFEST; then ?X: shell archive builder and may be removed by the user. Usually, they are ?X: not listed in the MANIFEST file, but you never know... ?X: - awk '$1 !~ /PACK[A-Z]+/ {print $1}' $rsrc/MANIFEST | split -50 + awk '$1 !~ /PACK[A-Z]+/ {print $1}' $rsrc/MANIFEST | split -l -50 rm -f missing tmppwd=`pwd` for filelist in x??; do diff --git a/mcon/U/nis.U b/mcon/U/nis.U index 283cb11..f8c82ab 100644 --- a/mcon/U/nis.U +++ b/mcon/U/nis.U @@ -162,4 +162,16 @@ esac case "$passcat" in '') passcat='cat /etc/passwd';; esac +case "$hostcat" in +'') hostcat='cat /etc/hosts';; +*) ;; +esac +case "$groupcat" in +'') groupcat='cat /etc/group';; +*) ;; +esac +case "$passcat" in +'') passcat='cat /etc/passwd';; +*) ;; +esac diff --git a/mcon/makegloss.SH b/mcon/makegloss.SH index 9928355..69525ee 100755 --- a/mcon/makegloss.SH +++ b/mcon/makegloss.SH @@ -113,14 +113,14 @@ while (<>) { $_ = "Unit: $unit"; $_ .= " (Also defines $also)" if $also; $_ .= " (With private $internal)" if $internal; - $head .= do format($_); + $head .= &format($_); if ($wants) { $_ = "Wants: $wants"; - $head .= do format($_); + $head .= &format($_); } if ($option) { $_ = "Optional: $option"; - $head .= do format($_); + $head .= &format($_); } $head .= "\n"; } -- cgit v1.2.3