summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitmodules3
-rwxr-xr-xbin/packinit.SH1
-rw-r--r--bin/packinit.man2
-rwxr-xr-xbin/perload2
m---------debian0
-rw-r--r--dist.man2
-rw-r--r--jmake/files/Jmake.rules10
-rw-r--r--mcon/U/nis.U12
8 files changed, 24 insertions, 8 deletions
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..ad915e6
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "debian"]
+ path = debian
+ url = git://git.debian.org/~srivasta/debian/debian-dir.git
diff --git a/bin/packinit.SH b/bin/packinit.SH
index c161093..1d65711 100755
--- 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 <<!GROK!THIS!
+#! /usr/bin/perl
# feed this into perl
eval "exec perl -S \$0 \$*"
if \$running_under_some_shell;
diff --git a/bin/packinit.man b/bin/packinit.man
index 09702fb..3cb4626 100644
--- a/bin/packinit.man
+++ b/bin/packinit.man
@@ -145,4 +145,4 @@ Larry Wall <lwall@netlabs.com> (version 2.0)
.br
Raphael Manfredi <ram@hptnos02.grenoble.hp.com>
.SH "SEE ALSO"
-dist(1).
+dist(7).
diff --git a/bin/perload b/bin/perload
index e71cbdd..7ef7137 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/debian b/debian
new file mode 160000
+Subproject 66067a4eba5e2c1f5f8a50f425a70f35663b00a
diff --git a/dist.man b/dist.man
index bd6ba49..f9eaf96 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/files/Jmake.rules b/jmake/files/Jmake.rules
index 21ef3fe..7d3aff0 100644
--- a/jmake/files/Jmake.rules
+++ b/jmake/files/Jmake.rules
@@ -489,7 +489,7 @@ local_deinstall.man:: @@\
*/
#define LinkFileList(step,list,dir,sub) @!\
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
@@ -1145,7 +1145,7 @@ local_realclean:: @@\
*/
#define CommonSubdirsRule(dirs) @!\
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..."; \ @@\
@@ -1159,7 +1159,7 @@ subdirs: @@\
*/
#define NamedTargetSubdirsRule(dirs,name,verb,flags) @!\
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..."; \ @@\
@@ -1386,7 +1386,7 @@ MakeLintSubdirs(dirs,lintlib)
*/
#define MakeMakeSubdirs(target) @!\
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..."; \ @@\
@@ -1405,7 +1405,7 @@ target:: @@\
*/
#define MakeMakefilesSH() @!\
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/nis.U b/mcon/U/nis.U
index f33eb0d..1ee73dd 100644
--- a/mcon/U/nis.U
+++ b/mcon/U/nis.U
@@ -165,4 +165,16 @@ case "$passcat" in
'') passcat=':'
$test -f /etc/passwd && 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